From 391eec3114a17e68652434c6eae610799d80290e Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 11:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
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 00fc35a..5e14d9b 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
@@ -165,7 +165,8 @@
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="display: flex">
<i v-if="data.oId=='parentNode'" class="iconShow el-icon-s-home"></i>
- <icon-show v-else :name="data.iconPath"></icon-show>
+ <icon-show v-if="data.oId!='parentNode' && data.iconPath && data.iconPath!='undefined'"
+ :name="data.iconPath"></icon-show>
{{ (node || {}).label }}
</span>
</span>
@@ -226,7 +227,9 @@
</el-radio>
</el-form-item>
</el-col>
- <el-col :span="24" v-show="basicForm.show=='0' && (basicForm.displayMode=='image'||basicForm.displayMode=='textandimage')">
+ <el-col
+ v-show="basicForm.show=='0' && (basicForm.displayMode=='image'||basicForm.displayMode=='textandimage')"
+ :span="24">
<el-form-item :class="basicForm.displayMode==='image'?'is-required':''" label="鍥炬爣锛�" prop="iconPath">
<input-icon v-model="basicForm.iconPath" :disabled="disabledBtn"></input-icon>
</el-form-item>
@@ -476,9 +479,10 @@
]
},
{
- label: '缂栧彿',
+ label: '搴忓彿',
prop: 'seq',
width: 100,
+ type: 'number',
labelWidth: 110,
hide: false,
rules: [
@@ -889,9 +893,9 @@
...mapGetters(["permission"]),
permissionChildrenList() {
return {
- UiPageLayoutAddBtn: this.vaildData(this.permission[this.$route.query.id].CLSRIGHT, false),
- UiPageLayoutEditBtn: this.vaildData(this.permission[this.$route.query.id].DATARIGHT, false),
- UiPageLayoutDelBtn: this.vaildData(this.permission[this.$route.query.id].ATTRRIGHT, false),
+ UiPageLayoutAddBtn: this.vaildData(this.permission[this.$route.query.id].ADD3, false),
+ UiPageLayoutEditBtn: this.vaildData(this.permission[this.$route.query.id].EDIT3, false),
+ UiPageLayoutDelBtn: this.vaildData(this.permission[this.$route.query.id].DELETE3, false),
UiPageLayoutCloneBtn: this.vaildData(this.permission[this.$route.query.id].CLONE, false),
UiPageLayoutDesignBtn: this.vaildData(this.permission[this.$route.query.id].UPLOAD, false),
}
@@ -1324,7 +1328,6 @@
} else {
return false;
}
- done();
});
},
--
Gitblit v1.9.3