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 | 110 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 43 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 9eef2a3..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
@@ -13,7 +13,8 @@
@selection-change="selectChangeHandler"
@row-click="rowClickHandler">
<template slot="menuLeft" slot-scope="scope">
- <el-button v-if="permissionChildrenList.UiPageLayoutAddBtn" class="button-custom-icon" plain size="small" type="primary"
+ <el-button v-if="permissionChildrenList.UiPageLayoutAddBtn" class="button-custom-icon" plain size="small"
+ type="primary"
@click="addClickHandler">
<icon-show :name="permissionChildrenList.UiPageLayoutAddBtn.source"></icon-show>
澧炲姞
@@ -26,15 +27,18 @@
<icon-show :name="permissionChildrenList.UiPageLayoutDesignBtn.source"></icon-show>
鎸夐挳璁捐
</el-button>
- <el-button v-if="permissionChildrenList.UiPageLayoutEditBtn" size="small" type="text" @click="editBtnClick(scope.row)">
+ <el-button v-if="permissionChildrenList.UiPageLayoutEditBtn" size="small" type="text"
+ @click="editBtnClick(scope.row)">
<icon-show :name="permissionChildrenList.UiPageLayoutEditBtn.source"></icon-show>
缂栬緫
</el-button>
- <el-button v-if="permissionChildrenList.UiPageLayoutDelBtn" size="small" type="text" @click="rowDeleteHandler(scope.row)">
+ <el-button v-if="permissionChildrenList.UiPageLayoutDelBtn" size="small" type="text"
+ @click="rowDeleteHandler(scope.row)">
<icon-show :name="permissionChildrenList.UiPageLayoutDelBtn.source"></icon-show>
鍒犻櫎
</el-button>
- <el-button v-if="permissionChildrenList.UiPageLayoutCloneBtn" size="small" type="text" @click="rowCloneHandler(scope.row)">
+ <el-button v-if="permissionChildrenList.UiPageLayoutCloneBtn" size="small" type="text"
+ @click="rowCloneHandler(scope.row)">
<icon-show :name="permissionChildrenList.UiPageLayoutCloneBtn.source"></icon-show>
鍏嬮殕
</el-button>
@@ -124,19 +128,27 @@
<el-container v-loading="dialogLoading">
<el-header style="height: 40px !important;padding-left: 5px;">
<div style="display: flex">
- <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="primary" @click="addClickBtnHandler">娣诲姞
+ <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="primary"
+ @click="addClickBtnHandler">娣诲姞
</el-button>
- <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="primary" @click="editClickBtnHandler">淇敼
+ <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="primary"
+ @click="editClickBtnHandler">淇敼
</el-button>
- <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="danger" @click="delClickBtnHandler">鍒犻櫎
+ <el-button v-show="disabledBtn" :disabled="!disabledBtn" plain size="mini" type="danger"
+ @click="delClickBtnHandler">鍒犻櫎
</el-button>
- <el-button v-show="!disabledBtn" :disabled="disabledBtn" plain size="mini" icon="el-icon-check" type="success" @click="saveClickBtnHandler">淇濆瓨
+ <el-button v-show="!disabledBtn" :disabled="disabledBtn" icon="el-icon-check" plain size="mini"
+ type="success" @click="saveClickBtnHandler">淇濆瓨
</el-button>
- <el-button v-show="!disabledBtn" :disabled="disabledBtn" plain size="mini" icon="el-icon-close" type="danger" @click="escClickBtnHandler">鍙栨秷
+ <el-button v-show="!disabledBtn" :disabled="disabledBtn" icon="el-icon-close" plain size="mini"
+ type="danger" @click="escClickBtnHandler">鍙栨秷
</el-button>
- <el-button v-show="disabledBtn" plain size="mini" type="primary" @click="changeBottomBtnHandler">璋冩暣涓轰笅绾ф寜閽�</el-button>
- <el-button v-show="disabledBtn" plain size="mini" type="primary" @click="changeTopBtnHandler">璋冩暣涓轰笂绾ф寜閽�</el-button>
- <el-button v-show="disabledBtn" plain size="mini" type="primary" @click="cloneClickBtnHandler">澶嶅埗鍒板叾浠栫粍浠�</el-button>
+ <el-button v-show="disabledBtn" plain size="mini" type="primary" @click="changeBottomBtnHandler">璋冩暣涓轰笅绾ф寜閽�
+ </el-button>
+ <el-button v-show="disabledBtn" plain size="mini" type="primary" @click="changeTopBtnHandler">璋冩暣涓轰笂绾ф寜閽�
+ </el-button>
+ <el-button v-show="disabledBtn" plain size="mini" type="primary" @click="cloneClickBtnHandler">澶嶅埗鍒板叾浠栫粍浠�
+ </el-button>
</div>
</el-header>
<el-container>
@@ -153,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>
@@ -176,15 +189,17 @@
</el-col>
<el-col :span="12">
- <el-form-item :inline-message='true' label="鍚嶇О锛�" prop="label">
+ <el-form-item label="鍚嶇О锛�" prop="label">
<el-input v-model="basicForm.label" :disabled="disabledBtn"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="Action锛�" prop="actionName">
- <el-input v-model="basicForm.actionName" :disabled="disabledBtn" :clearable="true" @focus="actionFoucus" @clear="clearActionValue">
- <i slot="suffix" class="el-input__icon el-icon-search" style="cursor: pointer" @click="actionFoucus"></i>
+ <el-input v-model="basicForm.actionName" :clearable="true" :disabled="disabledBtn"
+ @clear="clearActionValue" @focus="actionFoucus">
+ <i slot="suffix" class="el-input__icon el-icon-search" style="cursor: pointer"
+ @click="actionFoucus"></i>
</el-input>
</el-form-item>
</el-col>
@@ -204,15 +219,18 @@
</el-form-item>
</el-col>
- <el-col :span="12" v-show="basicForm.show=='0'">
+ <el-col v-show="basicForm.show=='0'" :span="12">
<el-form-item label="鏄剧ず鏂瑰紡锛�" prop="showType">
<el-radio v-model="basicForm.displayMode" :disabled="disabledBtn" label="text">鏂囧瓧</el-radio>
<el-radio v-model="basicForm.displayMode" :disabled="disabledBtn" label="image">鍥炬爣</el-radio>
- <el-radio v-model="basicForm.displayMode" :disabled="disabledBtn" label="textandimage">鏂囧瓧鍜屽浘鏍�</el-radio>
+ <el-radio v-model="basicForm.displayMode" :disabled="disabledBtn" label="textandimage">鏂囧瓧鍜屽浘鏍�
+ </el-radio>
</el-form-item>
</el-col>
- <el-col :span="24" v-show="basicForm.show=='0' && (basicForm.displayMode=='image'||basicForm.displayMode=='textandimage')">
- <el-form-item label="鍥炬爣锛�" prop="iconPath">
+ <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>
</el-col>
@@ -256,7 +274,8 @@
</el-container>
</el-container>
</el-dialog>
- <action-dialog ref="actionDialog" @cancelAction="actionCancelHandler" @updataAction="actionSaveHandler"></action-dialog>
+ <action-dialog ref="actionDialog" @cancelAction="actionCancelHandler"
+ @updataAction="actionSaveHandler"></action-dialog>
<clone-dialog ref="cloneDialog" :fromOid="fromOid" :sourceOId="sourceOId" paramsType="tab"
type="pageDef"></clone-dialog>
<clone-dialog ref="cloneBtnDialog" :fromOid="formBtnOid" :sourceOId="sourceBtnOid" paramsType="pageDef"
@@ -373,14 +392,15 @@
editBtn: false,
delBtn: false,
refreshBtn: false,
- dialogWidth:'600',
- menuWidth:'150',
+ dialogWidth: '600',
+ menuWidth: '140',
column: [
{
label: '鍚嶇О',
prop: 'name',
- width:180,
+ width: 180,
span: 24,
+ overHidden: true,
rules: [
{
required: true,
@@ -392,8 +412,9 @@
{
label: '鍊�',
prop: 'value',
- type:'textarea',
+ type: 'textarea',
span: 24,
+ overHidden: true,
rules: [
{
required: true,
@@ -435,14 +456,14 @@
data: [],
option: {
...basicOption,
- size:'mini',
+ size: 'mini',
height: this.height,
addBtn: false,
index: true,
calcHeight: -30,
editBtn: false,
delBtn: false,
- menuWidth:300,
+ menuWidth: 300,
column: [
{
label: '鍚嶇О',
@@ -458,9 +479,10 @@
]
},
{
- label: '缂栧彿',
+ label: '搴忓彿',
prop: 'seq',
- width:100,
+ width: 100,
+ type: 'number',
labelWidth: 110,
hide: false,
rules: [
@@ -613,8 +635,8 @@
],
group: [
{
- icon:'el-icon-info',
- label:'',
+ icon: 'el-icon-info',
+ label: '',
arrow: true,
prop: 'group1',
column: [
@@ -864,16 +886,16 @@
lastIndex: null,
selectList: [],
formDataRow: {},
- defaultForm:{},
+ defaultForm: {},
}
},
- computed:{
+ computed: {
...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),
}
@@ -1006,6 +1028,10 @@
if (row.templateType === '6') {
row.SubUIObjType = row.showType;
row.showType = "";
+ }
+ if (row.templateType === '5' && this.form.linkType && !this.form.showLinkAbs) {
+ this.$message.error('璇烽�夋嫨鍙傜収鏍戣缃�');
+ return loading();
}
const params = {
...row,
@@ -1256,14 +1282,14 @@
if (this.saveType === 'add') {
this.$refs.Tree.setCurrentKey(null);
this.$refs.form.resetFields();
- }else {
+ } else {
this.basicForm = {...this.defaultForm};
}
},
// 鎸夐挳璁捐淇濆瓨
saveClickBtnHandler() {
- if (this.basicForm.show == '0' && (this.basicForm.displayMode == 'image' || this.basicForm.displayMode == 'textandimage') && this.basicForm.iconPath == '') {
+ if (this.basicForm.show == '0' && this.basicForm.displayMode == 'image' && this.basicForm.iconPath == '') {
this.$message.error('璇烽�夋嫨鍥炬爣');
return;
}
@@ -1292,9 +1318,9 @@
this.$message.success(res.data.obj);
this.disabledBtn = true;
this.getTabBtnTree();
- this.basicForm = {};
this.paramsData = [];
this.dialogLoading = false;
+ this.$refs.form.resetFields();
}
}).catch(err => {
this.dialogLoading = false;
@@ -1302,8 +1328,6 @@
} else {
return false;
}
- done();
- this.$refs.form.resetFields();
});
},
@@ -1368,13 +1392,13 @@
},
// action閫夋嫨寮圭獥鐩存帴鍏抽棴
actionCancelHandler() {
- if(this.basicForm.actionOId){
+ if (this.basicForm.actionOId) {
this.$refs.form.clearValidate('Action')
}
},
//娓呴櫎action
- clearActionValue(){
+ clearActionValue() {
this.$set(this.basicForm, 'actionName', '');
this.$set(this.basicForm, 'actionOId', '');
},
--
Gitblit v1.9.3