From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 18:20:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
index 631f9ce..141f8e5 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/operateType/index.vue
@@ -7,7 +7,8 @@
@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.iconType=='svg'" :name="data.icon"></icon-show>
+ <i v-else :class="data.icon"></i>
{{ (node || {}).label }}
</span>
</span>
@@ -45,13 +46,13 @@
</el-button>
</div>
<el-form ref="form" :model="form" label-width="85px" style="max-height: calc(100vh - 180px);overflow: auto;">
- <el-form-item label="鍚嶇О锛�">
+ <el-form-item label="鍚嶇О锛�" class="is-required">
<el-input v-model="form.name" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
</el-form-item>
- <el-form-item label="鏍囪瘑锛�">
+ <el-form-item label="鏍囪瘑锛�" class="is-required">
<el-input v-model.trim="form.code" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ユ爣璇�"></el-input>
</el-form-item>
- <el-form-item label="鍒悕锛�">
+ <el-form-item label="鍒悕锛�" class="is-required">
<el-input v-model="form.alias" :disabled="!editStatus && !addStatus" placeholder="璇疯緭鍏ュ埆鍚�"></el-input>
</el-form-item>
<el-form-item label="鍥炬爣锛�">
@@ -59,7 +60,7 @@
</input-icon>
</el-form-item>
<el-form-item label="椤哄簭锛�">
- <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus" :max="9999" :min="0"
+ <el-input-number v-model="form.sort" :disabled="!editStatus && !addStatus" :max="63" :min="1"
label="椤哄簭"></el-input-number>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
@@ -93,6 +94,7 @@
menu: false,
addBtn: false,
defaultExpandAll: false,
+ defaultExpandedKeys:['operateNode'],
props: {
label: 'name',
value: 'id',
@@ -111,7 +113,8 @@
id: item.id,
name: item.name,
leaf: !item.hasChildren,
- icon: item.source || 'iconoir:home'
+ icon: item.source || (node.level === 0?'el-icon-s-home':'el-icon-s-tools'),
+ iconType:item.source?'svg':'iconfont'
}
}))
})
--
Gitblit v1.9.3