From bd4f0508ed8c7ee30b5b882cac1c300720ae15e7 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 04 十一月 2024 18:23:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue
index 9619374..14102a9 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/plShow.vue
@@ -40,7 +40,7 @@
width="800px"
@close="dialogClose"
>
- <el-form ref="form" :model="form" :rules="rules" label-width="100px" size="small">
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px" size="small" style="margin-bottom: 30px;">
<el-row>
<el-col :span="12">
<el-form-item label="椤甸潰缂栫爜锛�" prop="plCode">
@@ -93,12 +93,12 @@
<div>4銆佽緭鍏ユ椂锛屼笉瑕佹暡鍥炶溅鎹㈣銆�</div>
</div>
</el-form>
- <span slot="footer" class="dialog-footer">
- <el-button @click="dialogClose">鍙� 娑�</el-button>
- <el-button type="primary" @click="saveHandler">纭� 瀹�</el-button>
+ <span slot="footer" class="dialog-footer avue-dialog__footer">
+ <el-button size="small" type="primary" @click="saveHandler">淇� 瀛�</el-button>
+ <el-button size="small" @click="dialogClose">鍙� 娑�</el-button>
</span>
</el-dialog>
- <clone-dialog ref="cloneDialog"></clone-dialog>
+ <clone-dialog ref="cloneDialog" :fromOid="fromOid" :sourceOId="sourceOId" type="tabPage" paramsType="ui"></clone-dialog>
</div>
</template>
@@ -125,6 +125,8 @@
components:{bottomTable,cloneDialog},
data() {
return {
+ fromOid:'',
+ sourceOId:'',
uiDefineOid:'',
areaType: '',
tableLoading: false,
@@ -377,6 +379,8 @@
});
},
rowCloneHandler(row) {
+ this.fromOid = this.uiDefineData.plOId;
+ this.sourceOId = row.plOId;
this.$refs.cloneDialog.openDialog(row);
},
}
--
Gitblit v1.9.3