From 34c25ddf37a3eb8da9efb04efedad089f13efe83 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 24 七月 2024 18:20:27 +0800
Subject: [PATCH] 部门导入调整,按照部门名称/实现层级关系。枚举导入功能接口上传,属性池添加新增、查询、修改、导出、查看应用范围等接口。业务类型、链接类型、枚举类型增加等接口属性是否产生数据检查、根据属性名修改业务类型和连接类型中对应属性方法,以及属性池中需要的一些下拉查询接口。

---
 Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue
index d9834d3..4007355 100644
--- a/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue
@@ -4,8 +4,9 @@
     <div v-if="type === 'table' || type === 'TreeTable'">
       <!--top灞曠ず琛ㄦ牸涓婃柟鍖哄煙 menu灞曠ず琛ㄦ牸鎿嶄綔鏍忓尯鍩� 鏃犲氨鏄粯璁� -->
       <el-tooltip v-if="LocationType === 'top'" v-for="item in basicButtonList.top" :content="item.description || item.name" placement="top">
-        <el-button :key="item.oid" :icon="item.paramVOS.icon"
-                   :type="item.paramVOS.btnType || 'primary'" plain
+        <el-button :key="item.oid"
+                   :icon="item.paramVOS && item.paramVOS.icon ? item.paramVOS.icon :''"
+                   :type="item.paramVOS && item.paramVOS.btnType ?  item.paramVOS.btnType : 'primary'" plain
                    size="small"
                    @click="buttonClick(item)">{{ item.name }}</el-button>
       </el-tooltip>
@@ -28,8 +29,8 @@
     <div v-else-if="type === 'form'">
       <el-tooltip v-for="item in basicButtonList" :content="item.description || item.name" placement="top">
         <el-button :key="item.oid"
-                   :icon="item.paramVOS.icon"
-                   :type="item.paramVOS.btnType || 'primary'"
+                   :icon="item.paramVOS && item.paramVOS.icon ? item.paramVOS.icon :''"
+                   :type="item.paramVOS && item.paramVOS.btnType ?  item.paramVOS.btnType : 'primary'" plain
                    plain
                    size="small"
                    @click="buttonClick(item)">{{ item.name }}</el-button>
@@ -38,8 +39,8 @@
     <div v-else-if="type === 'tree'" class="tree-buttons">
       <el-tooltip v-for="item in basicButtonList" :content="item.description || item.name" placement="top">
         <el-button :key="item.oid"
-                   :icon="item.paramVOS.icon"
-                   :type="item.paramVOS.btnType || 'primary'"
+                   :icon="item.paramVOS && item.paramVOS.icon ? item.paramVOS.icon :''"
+                   :type="item.paramVOS && item.paramVOS.btnType ?  item.paramVOS.btnType : 'primary'" plain
                    plain
                    size="small"
                    @click="buttonClick(item)">{{ item.name }}</el-button>

--
Gitblit v1.9.3