From eddd1e5e67af55017fa5255b3d19f6ee02646121 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 10:12:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/public/index.html | 51 ++++++++++++++-----------
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue | 5 ++
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue | 36 +++++++++++++-----
Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue | 5 +-
Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue | 5 +-
5 files changed, 65 insertions(+), 37 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/public/index.html b/Source/plt-web/plt-web-ui/public/index.html
index d6f34f2..73ec373 100644
--- a/Source/plt-web/plt-web-ui/public/index.html
+++ b/Source/plt-web/plt-web-ui/public/index.html
@@ -27,6 +27,34 @@
<!-- 寮曞叆闃块噷宸村反鐨勫浘琛ㄥ簱iconfont鍜宻vg鍥炬爣鍚庯紝鐩存帴浣跨敤鍥炬爣鍚嶅嵆鍙紝璁板緱鍔犲墠缂� -->
<link rel="stylesheet" href="https://at.alicdn.com/t/font_567566_pwc3oottzol.css">
<script src="//at.alicdn.com/t/font_2621503_zcbiqy2g1i.js"></script>
+ <script>
+ //灏嗗紩鍏ョ殑鍥炬爣搴撴坊鍔犲埌椤圭洰鍥炬爣搴撲腑
+ let fontIconList=[{
+ label: '鑷畾涔夊紩鍏ョ殑svg鍥炬爣',
+ list: [ {
+ label: '鏈烘瀯',
+ value: '#icon-jigou'
+ },
+ {
+ label: '鐭俊绠＄悊',
+ value: '#icon-duanxinguanli'
+ },
+ {
+ label: '鍙戠エ绠＄悊绯荤粺',
+ value: '#icon-fapiaoguanlixitong'
+ },
+ {
+ label: '瑙掕壊',
+ value: '#icon-jiaose'
+ }]
+ }, {
+ label: "鑷畾涔夊紩鍏ョ殑瀛椾綋鍥炬爣",
+ list: [
+ "iconfont icon-huanyingye",
+ "icon-weixin1"]
+ }
+ ];
+ </script>
<title>PLTWEB骞冲彴</title>
<style>
@@ -120,29 +148,6 @@
<!--<script charset="utf-8" src="<%= BASE_URL %>cdn/avue/2.12.4/avue.min.js"></script>-->
<script charset="utf-8" src="<%= BASE_URL %>cdn/avue/2.13.1/avue.min.js"></script>
<script charset="utf-8" src="<%= BASE_URL %>cdn/nutflow/wf-design-base/index.umd.min.js"></script>
-
-<script>
- //灏嗗紩鍏ョ殑鍥炬爣搴撴坊鍔犲埌椤圭洰鍥炬爣搴撲腑
- let fontIconList=[{
- label: '闃块噷鍥炬爣-Symbol鍥炬爣',
- list: [ {
- label: '鏈烘瀯',
- value: '#icon-jigou'
- },
- {
- label: '鐭俊绠＄悊',
- value: '#icon-duanxinguanli'
- },
- {
- label: '鍙戠エ绠＄悊绯荤粺',
- value: '#icon-fapiaoguanlixitong'
- },
- {
- label: '瑙掕壊',
- value: '#icon-jiaose'
- }]
- }];
-</script>
</body>
</html>
diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
index 069d2d4..509bdb6 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-tree.vue
@@ -250,6 +250,11 @@
}
} else {
delete params.queryRoot;
+ if(this.paramVOS.querytemplate){
+ //璇存槑鏄�氳繃鎸夐挳鐐瑰嚮鎵撳紑鐨勶紝Action鍙傛暟涓厤缃湁this.paramVOS.querytemplate
+ delete params.queryTemplate;
+ delete params.linkTypeFlag;
+ }
}
getTree(parentOid, parentBtmName, params,url).then(res => {
resolve(res.data.treeData )
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
index 26cf5bf..45dd5fc 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/formDefine/components/formDialog.vue
@@ -613,7 +613,8 @@
:show-header="false"
border
stripe
- style="width: 100%">
+ style="width: 100%"
+ @row-click="customOptionTableClick">
<el-table-column
align="center"
label="鍚嶇О"
@@ -636,7 +637,9 @@
<el-button plain size="mini" style="margin-right: 5px" type="success"
@click="optionAddClickHandler('dialog')">娣诲姞
</el-button>
- <el-button plain size="mini" style="margin-left: 5px" type="danger">鍒犻櫎</el-button>
+ <el-button plain size="mini" style="margin-left: 5px" type="danger"
+ @click="optionDeleteClickHandler('dialog')">鍒犻櫎
+ </el-button>
</div>
</el-form-item>
</el-col>
@@ -1050,7 +1053,11 @@
children: 'children',
},
},
- treeData: []
+ treeData: [],
+ optionRow: {},
+ customOptionRow: {},
+ optionCurrentIndex: 0,
+ customOptionCurrentIndex: 0
}
},
computed: {
@@ -1117,10 +1124,9 @@
itemType: 'text',
itemName: data.data.name,
itemCols: "1",
- itemIsEditable:"0",
- itemIsRequired:"0",
+ itemIsEditable: "0",
+ itemIsRequired: "0",
}
- console.log(data);
const isDuplicate = this.formList.some(item => item.text === data.text);
if (isDuplicate) {
@@ -1137,7 +1143,6 @@
this.form = {...item};
this.topForm.position = index += 1;
// this.$forceUpdate();
- console.log(this.form);
},
// 璁剧疆鏄剧ず琛屾暟
@@ -1239,7 +1244,12 @@
// 閫夐」琛ㄦ牸琛岀偣鍑�
optionTableClick(row) {
+ this.optionRow = row;
console.log(row);
+ },
+
+ customOptionTableClick(row) {
+ this.customOptionRow = row;
},
// 閫夐」娣诲姞
@@ -1270,15 +1280,21 @@
const params = {
key: optionObj.optionName,
- value: optionObj.optionValue
+ value: optionObj.optionValue,
+ index: val === 'dialog' ? this.customOptionCurrentIndex++ : this.optionCurrentIndex++
};
itemKeyValueList.push(params);
},
// 閫夐」鍒犻櫎
- optionDeleteClickHandler() {
-
+ optionDeleteClickHandler(val) {
+ // console.log(this.optionRow);
+ if (val === 'dialog') {
+ this.customForm.itemKeyValueList.splice(this.customOptionRow.index,1);
+ } else {
+ this.form.itemKeyValueList.splice(this.optionRow.index,1);
+ }
},
// 娣诲姞鑷畾涔夌粍浠�
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
index 4a8598a..a8dd219 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/businessModel/index.vue
@@ -6,7 +6,7 @@
<avue-tree :key="refresh" node-key="id" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
- <i class="el-icon-s-promotion"></i>
+ <i :class="data.icon"></i>
{{ (node || {}).label }}
</span>
</span>
@@ -249,7 +249,8 @@
...item,
id: item.id,
name: item.name,
- leaf: !item.hasChildren
+ leaf: !item.hasChildren,
+ icon: item.source || 'iconfont iconicon_work'
}
}))
})
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
index 6806f68..e0c2963 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/mangeModel/index.vue
@@ -7,7 +7,7 @@
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
- <i class="el-icon-s-promotion"></i>
+ <i :class="data.icon"></i>
{{ (node || {}).label }}
</span>
</span>
@@ -252,7 +252,8 @@
...item,
id: item.id,
name: item.name,
- leaf: !item.hasChildren
+ leaf: !item.hasChildren,
+ icon: item.source || 'iconfont iconicon_work'
}
}))
})
--
Gitblit v1.9.3