From 716e7cfabbd3759b66aa1aceba4c4914512d50d4 Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 08 一月 2025 15:08:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/option.js | 12 +
Source/plt-web/plt-web-ui/src/views/system/role/index.vue | 38 ++--
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue | 4
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 14 +
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue | 3
Source/plt-web/plt-web-ui/src/styles/ui.scss | 47 +++--
Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue | 2
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue | 4
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue | 4
Source/plt-web/plt-web-ui/src/util/basic-option.js | 2
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue | 296 +++++-------------------------------
Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue | 2
Source/plt-web/plt-web-ui/src/components/PLT-basic-component/input-icon.vue | 2
13 files changed, 128 insertions(+), 302 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/input-icon.vue b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/input-icon.vue
index aee44d0..5849ea0 100644
--- a/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/input-icon.vue
+++ b/Source/plt-web/plt-web-ui/src/components/PLT-basic-component/input-icon.vue
@@ -1,7 +1,7 @@
<template>
<div>
<el-input :width="width" :class="inputClass" :style="inputStyle" :clearable="true" :value="value"
- :disabled="disabled" :placeholder="placeholder" type="text" :size="size" @clear="clearValue" @focus="handleFocus">
+ :disabled="disabled" :placeholder="placeholder" :read-only="true" type="text" :size="size" @clear="clearValue">
<span slot="append" v-html="svgHtml" style="font-size: 18px;padding:3px 10px;width:18px;height:18px;display: block" @click="handleFocus"></span>
</el-input>
<el-dialog v-dialogDrag
diff --git a/Source/plt-web/plt-web-ui/src/styles/ui.scss b/Source/plt-web/plt-web-ui/src/styles/ui.scss
index a14a8d6..7842105 100644
--- a/Source/plt-web/plt-web-ui/src/styles/ui.scss
+++ b/Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -409,13 +409,24 @@
min-height: 26px;
}
.avue-crud .avue-crud__menu .el-button{
- margin-bottom: 5px;
+
}
.avue-crud .avue-crud__menu .el-button--text{
padding: 2px 6px;
}
.avue-crud table td{
line-height: 22px;
+}
+/**宸︿晶鎿嶄綔鏍�**/
+.avue-crud__left{
+ display: flex;
+ align-items: center;
+}
+/**琛ㄥ唴鎿嶄綔鏍�**/
+.avue-crud .avue-crud__menu{
+ min-height: 22px;
+ display: flex;
+ justify-content: space-around;
}
.el-table--small, .el-table__expand-icon{
font-size: 14px;
@@ -454,12 +465,29 @@
bottom: 0;
}
/****澶勭悊鍥哄畾鍒楅敊琛岄棶棰�****/
+.el-table th.el-table__cell .cell{
+ display: flex;
+ justify-content:flex-start;
+}
+.el-table th.el-table__cell.is-center .cell{
+ justify-content:center;
+}
+
+.el-table th.el-table__cell.is-right .cell{
+ justify-content: flex-end;
+}
+.el-table th.el-table__cell .cell span:first-child{
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+}
.el-table .el-table__fixed,.el-table .el-table__fixed-right{
height: 100% !important;
}
.el-table__fixed .el-table__fixed-body-wrapper,.el-table__fixed-right .el-table__fixed-body-wrapper{
- height: calc(100% - 37px) !important;
- top:37px !important;
+ height: calc(100% - 47px) !important;
+ top:35px !important;
+ padding-bottom: 12px !important;
}
/*
鍒嗛〉
@@ -624,19 +652,6 @@
content: '';
}
-.avue-crud .avue-crud__menu .el-button{
- margin-top: 5px;
-}
-
-.avue-crud__left{
- display: flex;
- align-items: center;
-}
-
-.avue-crud__menu{
- display: flex;
- justify-content: space-around;
-}
.font14{font-size: 14px;width: 12px;height: 12px;display: inline-block;}
.font16{font-size: 16px;width: 14px;height: 14px;display: inline-block;}
diff --git a/Source/plt-web/plt-web-ui/src/util/basic-option.js b/Source/plt-web/plt-web-ui/src/util/basic-option.js
index f359631..42beef5 100644
--- a/Source/plt-web/plt-web-ui/src/util/basic-option.js
+++ b/Source/plt-web/plt-web-ui/src/util/basic-option.js
@@ -4,7 +4,6 @@
index:true,
indexFixed:false,//鍥哄畾鍒�
dialogDrag:true,
- searchShow:true,
searchIcon:true,
selection:true, //鏄惁鏈夐�夋嫨妗�
selectionFixed:false,
@@ -13,6 +12,7 @@
align: 'center',
emptyText: '鏆傛棤鍐呭',
tip:false,
+ searchShow:false,//鎼滅储鏍忛粯璁ら殣钘�
// menu:false, 鏄惁鏈夋搷浣滄爮
// menuTitle:xxx, 鎿嶄綔鏍忔爣棰�
}
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
index 21ce094..23e05b4 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/dataAuthorization/index.vue
@@ -8,7 +8,7 @@
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span>
- <i class="el-icon-s-promotion"></i>
+ <icon-show :name="data.icon"></icon-show>
{{ (node || {}).label }}
</span>
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue b/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
index 94d1078..d7ca5a6 100644
--- a/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/authority/ui/typeAction/index.vue
@@ -9,7 +9,7 @@
<avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span>
- <i class="el-icon-s-promotion"></i>
+ <icon-show :name="data.icon"></icon-show>
{{ (node || {}).label }}
</span>
</span>
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
index 3cf1cd1..38f627e 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
@@ -205,8 +205,8 @@
浣跨敤鏋氫妇
</template>
<div>
- <el-tag :type="lastItem.enumFlag ? 'success' : 'danger'">
- {{ lastItem.enumFlag ? '鏄�' : '鍚�' }}
+ <el-tag :type="lastItem.enumId ? 'success' : 'danger'">
+ {{ lastItem.enumId ? '鏄�' : '鍚�' }}
</el-tag>
</div>
</el-descriptions-item>
@@ -215,7 +215,7 @@
鏋氫妇绫诲瀷
</template>
<div>
- {{ lastItem.enumFlag }}
+ {{ lastItem.enumId }}
</div>
</el-descriptions-item>
<el-descriptions-item>
@@ -320,18 +320,19 @@
</el-col>
<el-col :span="8">
<el-form-item label="閫夋嫨鍙傜収绫诲瀷锛�" prop="referValue">
- <el-input v-model="form.referValue" :clearable="true" @focus="referFormFocusHandler"></el-input>
+ <avue-input-tree key="businessReferValue" v-if="form.attributeSelectType === 'business'" default-expand-all :clearable="true" v-model="form.referValue" placeholder="璇烽�夋嫨鍐呭" :dic="businessData" @change="referValueChange"></avue-input-tree>
+ <avue-input-tree key="linkReferValue" v-else default-expand-all v-model="form.referValue" placeholder="璇烽�夋嫨鍐呭" :clearable="true" :dic="linkTypeData" @change="referValueChange"></avue-input-tree>
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item v-if="form.attributeSelectType === 'link'" label="鐗堟湰娆★細" prop="version">
+ <el-form-item v-show="form.attributeSelectType === 'link'" label="鐗堟湰娆★細" prop="version">
<el-select v-model="form.version" placeholder="璇烽�夋嫨鐗堟湰娆�">
<el-option :value="1" label="褰撳墠鐗堟湰娆�"></el-option>
<el-option :value="3" label="鏈�鏂扮増鏈"></el-option>
</el-select>
</el-form-item>
</el-col>
- <div v-if="!form.referValue" style="clear: both">
+ <div v-show="showEnumSwitch" style="clear: both">
<el-col :span="8">
<el-form-item label="浣跨敤鏋氫妇锛�" prop="enumSwitch">
<el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch>
@@ -513,58 +514,6 @@
</div>
</div>
</el-form>
-
- <!-- 涓氬姟绫诲瀷瀵硅瘽妗� -->
- <el-dialog
- v-dialogDrag
- :visible.sync="businessVisible"
- append-to-body="true"
- class="avue-dialog"
- title="涓氬姟绫诲瀷閫夋嫨"
- width="70%"
- >
- <avue-crud
- ref="businessCrud"
- :data="businessData"
- :option="businessOption"
- :table-loading="businessLoading"
- @search-change="businessHandleSearch"
- @search-reset="businessHandleReset"
- @row-click="businessRowClick"
- >
- </avue-crud>
- <span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="businessSaveHandler">纭� 瀹�</el-button>
- <el-button @click="businessEmpty">娓� 绌�</el-button>
- <el-button @click="businessVisible = false">鍙� 娑�</el-button>
- </span>
- </el-dialog>
-
- <!-- 閾炬帴绫诲瀷瀵硅瘽妗� -->
- <el-dialog
- v-dialogDrag
- :visible.sync="linkTypeVisible"
- append-to-body="true"
- class="avue-dialog"
- title="閾炬帴绫诲瀷閫夋嫨"
- width="70%"
- >
- <avue-crud
- ref="linkTypeCrud"
- :data="linkTypeData"
- :option="linkTypeOption"
- :table-loading="linkTypeLoading"
- @search-change="linkHandleSearch"
- @search-reset="linkHandleReset"
- @row-click="linkRowClick"
- >
- </avue-crud>
- <span slot="footer" class="dialog-footer">
- <el-button @click="linkEmpty">娓� 绌�</el-button>
- <el-button @click="linkTypeVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="linkSaveHandler">纭� 瀹�</el-button>
- </span>
- </el-dialog>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="addSaveHandler">纭� 瀹�</el-button>
@@ -625,73 +574,8 @@
]
},
dialogTitle: "",
- businessRow: {},
- linkRow: {},
- linkDataSearch: [],
- businessSearchParams: {},
- linkTypeSearchParams: {},
- businessLoading: false,
- linkTypeLoading: false,
- businessVisible: false,
- linkTypeVisible: false,
businessData: [],
linkTypeData: [],
- businessOption: {
- ...basicOption,
- addBtn: false,
- menu: false,
- searchMenuSpan: 8,
- selection: false,
- refreshBtn: false,
- searchLabelWidth: 100,
- highlightCurrentRow: true,
- column: [
- {
- label: '涓氬姟绫诲瀷鍚�',
- prop: 'name',
- sortable: true,
- search: true
- },
- {
- label: '鏍囩',
- prop: 'label',
- sortable: true,
- },
- {
- label: '鐖剁被',
- prop: 'fName',
- sortable: true,
- },
- {
- label: '鐗堟湰瑙勫垯',
- prop: 'revRuleName',
- sortable: true,
- },
- {
- label: '鐢熷懡鍛ㄦ湡',
- prop: 'lifeCycle',
- sortable: true,
- },
- ]
- },
- linkTypeOption: {
- ...basicOption,
- addBtn: false,
- menu: false,
- searchMenuSpan: 8,
- selection: false,
- refreshBtn: false,
- searchLabelWidth: 100,
- highlightCurrentRow: true,
- column: [
- {
- label: '閾炬帴绫诲瀷鍚�',
- prop: 'name',
- sortable: true,
- search: true
- },
- ]
- },
tableData: [],
option: {
...basicOption,
@@ -744,6 +628,8 @@
},
addVisible: false,
addLoading: false,
+ referValueDic:[],
+ showEnumSwitch:false,
form: {
id: "",
name: "",
@@ -833,9 +719,24 @@
this.tableData = data;
this.page.total = res.data.total;
this.tableLoading = false;
- }).catch(err => {
- this.$message.error(err)
});
+ //鑾峰彇涓氬姟绫诲瀷鏁版嵁
+ getBizTypes().then(res => {
+ const data = res.data.data.map(item => ({
+ label: item.name,
+ value:item.name,
+ desc:item.label
+ }));
+ this.businessData = data;
+ })
+ //鑾峰彇閾炬帴绫诲瀷鏁版嵁
+ getAllLtName().then(res => {
+ const data = res.data.data.map(item => ({
+ label: item,
+ value:item
+ }));
+ this.linkTypeData = data;
+ })
},
// 琛ㄦ牸澶撮儴鍒锋柊
@@ -844,7 +745,7 @@
},
// 鎼滅储
- handleSearch(params, done) {
+ handleSearch(params, done) {debugger;
this.searchParams = {
"conditionMap[id]": "*" + params.id + "*"
};
@@ -1184,136 +1085,13 @@
},
// 鍊煎煙绫诲瀷鍒囨崲
attributeSelectTypeChange() {
+ this.form.referValue = ''; // 鍒囨崲鍊煎煙绫诲瀷 娓呯┖褰撳墠鍙傜収
this.$forceUpdate(); // 寮哄埗鏇存柊form缁勪欢
- this.form.referValue = null; // 鍒囨崲鍊煎煙绫诲瀷 娓呯┖褰撳墠鍙傜収
},
-
- // 閫夋嫨鍙傜収
- referFormFocusHandler() {
- const handlers = {
- business: () => {
- this.businessVisible = true;
- this.businessLoading = true;
- this.businessGetTable();
- },
- link: () => {
- this.linkTypeVisible = true;
- this.linkTypeLoading = true;
- this.linkGetTable();
- }
- };
-
- const {attributeSelectType} = this.form;
- const handler = handlers[attributeSelectType];
-
- if (handler) {
- handler();
- }
- ;
+ //鍙傜収绫诲瀷鏁版嵁鍙樺寲
+ referValueChange(data){
+ this.showEnumSwitch=!data.value;
},
-
- // 涓氬姟绫诲瀷琛ㄦ牸鏁版嵁璇锋眰
- businessGetTable() {
- getBizTypes(this.businessSearchParams).then(res => {
- const data = res.data.data;
- this.businessData = data;
- this.businessLoading = false;
- })
- },
-
- // 涓氬姟绫诲瀷鍙傜収鎼滅储
- businessHandleSearch(val, done) {
- this.businessSearchParams = {
- btmName: val.name
- }
- this.businessGetTable();
- done()
- },
-
- // 涓氬姟绫诲瀷鍙傜収娓呯┖鎼滅储
- businessHandleReset() {
- this.businessSearchParams = {};
- this.businessGetTable();
- },
-
- // 閾炬帴绫诲瀷琛ㄦ牸鏁版嵁璇锋眰
- linkGetTable() {
- getAllLtName(this.linkTypeSearchParams).then(res => {
- const data = res.data.data.map(item => ({name: item}));
- ;
- this.linkTypeData = data;
- this.linkDataSearch = data;
- this.linkTypeLoading = false;
- })
- },
-
- // 閾炬帴绫诲瀷鍙傜収鎼滅储
- linkHandleSearch(params, done) {
- const {name} = params;
-
- if (!params.name) {
- this.linkTypeData = this.linkDataSearch;
- return done();
- }
- ;
-
- this.linkTypeData = this.linkDataSearch.filter(item => {
- console.log(item)
- return item.name && item.name.includes(name);
- });
-
- done();
- },
-
- // 閾炬帴绫诲瀷鍙傜収娓呯┖鎼滅储
- linkHandleReset() {
- this.linkTypeData = this.linkDataSearch;
- },
-
- // 涓氬姟绫诲瀷琛ㄦ牸琛岀偣鍑�
- businessRowClick(row) {
- this.businessRow = row;
- },
-
- // 涓氬姟绫诲瀷纭畾淇濆瓨
- businessSaveHandler() {
- if (func.isEmptyObject(this.businessRow)) {
- this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹紒')
- return;
- }
-
- this.form.referValue = this.businessRow.name;
- this.businessVisible = false;
- },
-
- // 涓氬姟绫诲瀷娓呯┖
- businessEmpty() {
- this.form.referValue = null;
- this.businessVisible = false;
- },
-
- // 閾炬帴绫诲瀷纭畾淇濆瓨
- linkRowClick(row) {
- this.linkRow = row;
- },
-
- // 涓氬姟绫诲瀷纭畾淇濆瓨
- linkSaveHandler() {
- if (func.isEmptyObject(this.linkRow)) {
- this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹紒')
- return;
- }
-
- this.form.referValue = this.linkRow.name;
- this.linkTypeVisible = false;
- },
-
- // 閾炬帴绫诲瀷娓呯┖
- linkEmpty() {
- this.form.referValue = null;
- this.linkTypeVisible = false;
- },
-
// 鍏抽棴鏂板瀵硅瘽妗�
addEscHandler() {
this.addVisible = false;
@@ -1334,7 +1112,7 @@
attributeSelectType: "business",
version: 1,
defaultValue: "",//榛樿鍊�
- referValue: "",
+ referValue: null,
btmTypeId: "",
linkTypeName: "",
rangeValue: ""
@@ -1347,6 +1125,16 @@
addSaveHandler() {
this.$refs.form.validate((valid) => {
if (valid) {
+ if(this.form.attributeDataType === 'VTString'){
+ if(!this.form.referValue){
+ //鍙傜収绫诲瀷娌℃湁鍊�
+
+ }else {
+ this.form.enumSwitch=false;
+ this.form.rangeValue=''
+ }
+ }
+
this.form.range = this.form.rangeValue ? this.form.rangeValue.replace(/\n/g, ';') : '';
if (this.form.attributeSelectType === 'business') {
this.form.btmTypeId = this.form.referValue;
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/option.js b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/option.js
index 1440b66..6b28509 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/option.js
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/option.js
@@ -4,6 +4,18 @@
prop: 'id',
search: true,
sortable: true,
+ type:'select',
+ allowCreate:true,
+ filterable:true,
+ props:{
+ label:'id',
+ value:'id'
+ },
+ dicUrl:"/api/attributeController/gridAttribute",
+ dicQuery:{
+ page:1,
+ limit:-1
+ }
},
{
label: '鏍囩',
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
index 56840c0..8e88f58 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Aciton/index.vue
@@ -12,7 +12,7 @@
@node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="display: flex">
- <icon-show :name="data.icon"></icon-show>
+ <icon-show v-if="data.icon" :name="data.icon"></icon-show>
{{ (node || {}).label }}
</span>
</span>
@@ -354,7 +354,7 @@
{
required: true,
message: '璇烽�夋嫨鍥炬爣',
- trigger: 'blur'
+ trigger: 'submit'
}
]
},
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue
index 4bdb4a0..ab0a66b 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue
@@ -29,7 +29,7 @@
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane v-for="item in iconList" :label="item.lable" :name="item.lable" style="height: calc(100vh - 270px);overflow: auto ">
- <div class="iconList">
+ <div class="iconList" :key="key">
<div class="iconItem" v-for="svg in item.list"
:data-value="svg.name" v-right-click="{action:checkSvg,data:svg}">
<div class="svgContent" v-html="svg.content"></div>
@@ -110,6 +110,7 @@
},
data() {
return {
+ key:1,
types: [],
checkedTypes:[],
searchText:'',
@@ -264,6 +265,7 @@
if (this.iconList.length > 0) {
this.activeName = this.iconList[0].lable;
}
+ this.key++;
} else {
this.$message.error(res.data.msg);
}
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
index 65fac14..75cb5d3 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
@@ -240,12 +240,14 @@
column: [{
label: '鍚嶇О',
prop: 'plName',
- search: true
+ search: true,
+ overHidden:true
}, {
label: 'UI涓婁笅鏂�',
prop: 'plCode',
search: true,
sortable: true,
+ overHidden:true
}, {
label: '瀵艰埅鍖�',
prop: 'plIsShowNavigator',
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
index 747c645..9eef2a3 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue
@@ -412,13 +412,11 @@
{required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur'},
],
actionName: [
- {required: true, message: '璇烽�夋嫨Action', trigger: 'blur'},
+ {required: true, message: '璇烽�夋嫨Action', trigger: 'change'},
],
},
// 鎸夐挳璁捐 鍩虹淇℃伅
- basicForm: {
- seq: 1
- },
+ basicForm: {},
treeData: [],
treeOption: {
menu: false,
@@ -866,6 +864,7 @@
lastIndex: null,
selectList: [],
formDataRow: {},
+ defaultForm:{},
}
},
computed:{
@@ -1176,13 +1175,14 @@
// 鎸夐挳璁捐琛岀偣鍑�
nodeTreeClick(row) {
this.nodeTreeRow = row;
+ this.defaultForm = {...row};
this.basicForm = {...row};
this.paramsData = row.buttonParams ? Object.entries(row.buttonParams).map(([key, value]) => ({
name: key,
value: value
})) : [];
this.disabledBtn = true;
- this.$refs.form.clearValidate()
+ this.$refs.form.clearValidate();
},
// 鎸夐挳璁捐鍙傛暟淇℃伅鍒犻櫎
@@ -1255,6 +1255,9 @@
this.disabledBtn = true;
if (this.saveType === 'add') {
this.$refs.Tree.setCurrentKey(null);
+ this.$refs.form.resetFields();
+ }else {
+ this.basicForm = {...this.defaultForm};
}
},
@@ -1300,6 +1303,7 @@
return false;
}
done();
+ this.$refs.form.resetFields();
});
},
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue
index 7615eaf..6a96108 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog.vue
@@ -16,6 +16,7 @@
<avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span>
+ <icon-show :name="data.icon"></icon-show>
{{ (node || {}).label }}
</span>
</span>
@@ -149,11 +150,9 @@
level: this.paramsType
}
this.defaultExpandKeys = ['root'];
- console.log(row);
getAllLevelTreeByBtm(params).then(res => {
this.uiTreeOption.defaultExpandedKeys = [res.data.obj.oid];
this.uiTreeData = [res.data.obj];
- console.log(res);
this.rightLoading = false;
}).catch(error => {
this.rightLoading = false;
diff --git a/Source/plt-web/plt-web-ui/src/views/system/role/index.vue b/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
index cc5ca1e..a32d588 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/role/index.vue
@@ -26,11 +26,6 @@
<icon-show :name="permissionList.delBtn.source"></icon-show>
鍒犻櫎
</el-button>
- <el-button v-if="permissionList.assignMembersBtn" class="button-custom-icon" plain size="small" type="primary"
- @click="assignMembersHandler">
- <icon-show :name="permissionList.assignMembersBtn.source"></icon-show>
- 鍒嗛厤鎴愬憳
- </el-button>
<el-button v-if="permissionList.statisticsBtn" class="button-custom-icon" plain size="small" type="primary"
@click="statisticsHandler">
<icon-show :name="permissionList.statisticsBtn.source"></icon-show>
@@ -48,6 +43,15 @@
</template>
<template slot="menu" slot-scope="{ row, index }">
+ <el-button
+ v-if="permissionList.assignMembersBtn"
+ size="small"
+ type="text"
+ @click="assignMembersHandler(row, index)"
+ >
+ <icon-show :name="permissionList.assignMembersBtn.source"></icon-show>
+ 鍒嗛厤鎴愬憳
+ </el-button>
<el-button
v-if="permissionList.editBtn"
size="small"
@@ -341,19 +345,19 @@
},
// 鍒嗛厤鎴愬憳
- assignMembersHandler() {
- if (this.selectList.length <= 0) {
- this.$message.warning('璇烽�夋嫨瑙掕壊杩涜鎴愬憳鍒嗛厤锛�');
- return;
- }
-
- if (this.selectList.length > 1) {
- this.$message.warning('涓�娆″彧鑳藉涓�涓鑹茶繘琛屽垎閰嶆垚鍛樻搷浣滐紒');
- return;
- }
+ assignMembersHandler(row,index) {
+ // if (this.selectList.length <= 0) {
+ // this.$message.warning('璇烽�夋嫨瑙掕壊杩涜鎴愬憳鍒嗛厤锛�');
+ // return;
+ // }
+ //
+ // if (this.selectList.length > 1) {
+ // this.$message.warning('涓�娆″彧鑳藉涓�涓鑹茶繘琛屽垎閰嶆垚鍛樻搷浣滐紒');
+ // return;
+ // }
Promise.all([
- listUserUnInRoleOid({pkRole: this.selectList[0].oid}),
- listUserByRoleOid({pkRole: this.selectList[0].oid})
+ listUserUnInRoleOid({pkRole: row.oid}),
+ listUserByRoleOid({pkRole: row.oid})
]).then(([unInRoleRes, byRoleRes]) => {
this.leftRoleData = [];
this.rightRoleData = [];
--
Gitblit v1.9.3