| Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/plt-web/plt-web-ui/src/styles/ui.scss | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/plt-web/plt-web-ui/src/util/func.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Source/plt-web/plt-web-ui/src/views/system/department/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Source/plt-web/plt-web-ui/src/components/dynamic-components/dynamic-button.vue
@@ -5,10 +5,11 @@ <!--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 && 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> @click="buttonClick(item)"> <icon-show :name="item.iconPath"></icon-show>{{ item.name }} </el-button> </el-tooltip> <el-button type="text" @click="handleDefaultAddChildren(scope.row)" v-if="(LocationType === 'menu' && type === 'TreeTable')">新增子级</el-button> @@ -16,10 +17,13 @@ <el-tooltip v-if="LocationType === 'menu'" v-for="item in basicButtonList.menu" :content="item.description || item.name" placement="top"> <el-button :key="item.oid" :icon="item.paramVOS.icon ? item.paramVOS.icon : (item.id === 'edit' ? 'el-icon-edit' : (item.id === 'delete' ||item.id === 'del' ? 'el-icon-delete' : ''))" :type="item.paramVOS.btnType || 'text'" plain size="small" @click="buttonClick(item,scope.row)">{{ item.name }}</el-button> @click="buttonClick(item,scope.row)"> <icon-show v-if="item.iconPath" :name="item.iconPath"></icon-show> <i v-else :class="item.id === 'edit' ? 'el-icon-edit' : (item.id === 'delete' ||item.id === 'del' ? 'el-icon-delete' : '')"></i> {{ item.name }} </el-button> </el-tooltip> <!-- 表格内按钮操作对话框表单 --> @@ -29,21 +33,23 @@ <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 && 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> @click="buttonClick(item)"> <icon-show :name="item.iconPath"></icon-show>{{ item.name }} </el-button> </el-tooltip> </div> <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 && 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> @click="buttonClick(item)"> <icon-show :name="item.iconPath"></icon-show>{{ item.name }} </el-button> </el-tooltip> <el-button type="primary" plain Source/plt-web/plt-web-ui/src/styles/ui.scss
@@ -530,7 +530,28 @@ text-align: center; padding-left: 4.5px; } /*显示svg图标的按钮*/ .el-button--small.button-custom-icon{ padding: 7px 14px; } .el-button--small.button-custom-icon > span{ height: 16px; display: -webkit-box; display: -ms-flexbox; display: flex; -webkit-box-align: center; -ms-flex-align: center; align-items: center; -webkit-box-pack: center; -ms-flex-pack: center; justify-content: center; } .el-button--small.button-custom-icon > span .iconShow{ font-size: 16px !important; width: 16px !important; height: 16px !important; margin-right: 6px; } /* 树 */ Source/plt-web/plt-web-ui/src/util/func.js
@@ -329,7 +329,7 @@ if (iconList && iconList.length > 0) { let libName = name.split(':')[0]; let currentLic = iconList.find(item => item.lable == libName); if (currentLic.list) { if (currentLic && currentLic.list) { currentLic.list.find(item => { if (item.name == name) { svgHtml = item.content; @@ -339,11 +339,21 @@ } }else { getIcons().then(res => { this.iconList=res.data.data; store.dispatch("setIcons", this.iconList); if(this.iconList.length>0) { this.activeName=this.iconList[0].lable; store.dispatch("setIcons", res.data.data); let iconList = res.data.data; if (iconList && iconList.length > 0) { let libName = name.split(':')[0]; let currentLic = iconList.find(item => item.lable == libName); if (currentLic.list) { currentLic.list.find(item => { if (item.name == name) { svgHtml = item.content; } return item.name == name; }) } } return svgHtml; }) } } Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/businessType/index.vue
@@ -3,7 +3,6 @@ <el-aside> <basic-container> <div ref="TreeBox" style="height: calc(100vh - 154px);!important;"> <!-- 左侧树 --> <div style="height: calc(100vh - 190px);"> <avue-tree ref="tree" v-loading="treeLoading" :data="treeData" :option="treeOption" @node-click="nodeClick"> Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/index.vue
@@ -38,7 +38,7 @@ </el-button> <!--<el-button icon="el-icon-edit" plain size="small" type="primary" @click="editHandler">修改</el-button> <el-button icon="el-icon-delete" plain size="small" type="danger" @click="delHandler">删除</el-button>--> <el-button v-if="permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" <el-button v-if="!permissionList.importBtn" icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadClickHandler">导入 </el-button> <el-button v-if="permissionList.exportBtn" icon="el-icon-download" plain size="small" type="primary" Source/plt-web/plt-web-ui/src/views/system/department/index.vue
@@ -356,8 +356,6 @@ this.rightTransferData = byRoleRes.data.data.map(item => item.oid); this.$refs.transfer.visible = true; } }).catch(err => { console.error(err); }); },
