From 06272b4e887651be78de34a6483c37870e030fb9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 20 三月 2024 17:29:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue | 254 +++++++++-----------------------------------------
1 files changed, 48 insertions(+), 206 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index b5322d1..eece340 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -1,25 +1,38 @@
<template>
- <!--琛ㄦ牸鍩虹鎸夐挳-->
- <div v-if="type === 'table'">
- <!--top灞曠ず琛ㄦ牸涓婃柟鍖哄煙 menu灞曠ず琛ㄦ牸鎿嶄綔鏍忓尯鍩� -->
- <el-button v-for="item in basicButtonList.top"
- v-if="LocationType === 'top'"
- :key="item.oid" :icon="item.icon"
- :type="item.paramVOS.buttonType || 'primary'" plain
- size="small"
- @click="buttonClick(item)">
- {{ item.name }}
- </el-button>
+ <div>
+ <!--琛ㄦ牸鍩虹鎸夐挳-->
+ <div v-if="type === 'table'">
+ <!--top灞曠ず琛ㄦ牸涓婃柟鍖哄煙 menu灞曠ず琛ㄦ牸鎿嶄綔鏍忓尯鍩� -->
+ <el-button v-for="item in basicButtonList.top"
+ v-if="LocationType === 'top'"
+ :key="item.oid" :icon="item.icon"
+ :type="item.paramVOS.buttonType || 'primary'" plain
+ size="small"
+ @click="buttonClick(item)">
+ {{ item.name }}
+ </el-button>
- <el-button v-for="item in basicButtonList.menu"
- v-if="LocationType === 'menu'"
- :key="item.oid" :icon="item.paramVOS.icon"
- :type="item.paramVOS.buttonType || 'primary'" plain
- size="small"
- @click="buttonClick(item,scope)">
- {{ item.name }}
- </el-button>
-<!-- <dynamic-form :title="formName" :visible.sync="visible"></dynamic-form>-->
+ <el-button v-for="item in basicButtonList.menu"
+ v-if="LocationType === 'menu'"
+ :key="item.oid"
+ :icon="item.paramVOS.icon ? item.paramVOS.icon : (item.paramVOS.buttonMethods === 'edit' ? 'el-icon-edit' : (item.paramVOS.buttonMethods === 'delete' ? 'el-icon-delete' : ''))"
+ :type="item.paramVOS.buttonType || 'text'" plain
+ size="small"
+ @click="buttonClick(item,scope)">
+ {{ item.name }}
+ </el-button>
+ </div>
+ <div v-else-if="type === 'form'">
+ <el-button v-for="item in basicButtonList"
+ :key="item.oid"
+ :icon="item.icon"
+ :type="(item.paramVOS.buttonType !== 'text' ? item.paramVOS.buttonType : 'primary') || 'primary'"
+ plain
+ size="small"
+ @click="buttonClick(item)">
+ {{ item.name }}
+ </el-button>
+ </div>
</div>
</template>
@@ -36,214 +49,43 @@
LocationType: {
type: String,
},
- scope:{
- type:Object,
+ scope: {
+ type: Object,
+ },
+ butttonList: {
+ type: Array
}
},
data() {
return {
visible: false,
formName: '',
- butttonList: [
- {
- actionVO: {
- actionCls: "",
- actionUsedType: "business",
- bsUrl: "null",
- createTime: "2013-11-01 15:17:45.000",
- creator: "eddieliu",
- csClass: "plm.uif.actions.client.AddAction",
- description: "鍒涘缓涓氬姟瀵硅薄",
- id: "add",
- lastModifier: "developer",
- lastModifyTime: "2013-11-01 15:17:45.000",
- licensors: null,
- name: "鍒涘缓",
- oid: "65274704-5557-231C-E3EA-0B32B9BD5A0B"
- },
- areaType: "tab",
- authorization: true,
- children: null,
- createTime: "2022-07-18 17:29:10.000",
- creator: "developer",
- csUrl: "plm.uif.actions.client.AddAction",
- description: "",
- displayMode: "textandimage",
- hidden: false,
- iconPath: "",
- id: "add",
- lastModifier: "developer",
- lastModifyTime: "2022-07-18 17:29:10.000",
- name: "鏂板",
- oid: "DD34108A-5978-334C-7A2A-45F2EE158B1D",
- orderNum: 1,
- paramVOS: {
- form: "DepartmentProcessReviewForm",
- context: "EditDepartmentProcessReview",
- type: "processreview",
- initvalue: "reviewtype=department",
- location: 'top',
- buttonType: 'primary',
- buttonMethods: 'add'
- },
- pkComponent: "D99AD59E-563F-AB7A-F307-794B929114CD",
- pkParentOid: "",
- url: "null"
- },
- {
- actionVO: {
- actionCls: "",
- actionUsedType: "business",
- bsUrl: "BaseEditAction#doAction",
- createTime: "2013-11-09 10:32:41.000",
- creator: "eddieliu",
- csClass: "plm.uif.actions.client.EditAction",
- description: "淇敼涓氬姟瀵硅薄",
- id: "edit",
- lastModifier: "developer",
- lastModifyTime: "2013-11-09 10:32:41.000",
- licensors: null,
- name: "淇敼",
- oid: "F8534EFE-130B-0CB3-D477-2AC7B19B7DC4"
- },
- areaType: "tab",
- authorization: true,
- children: null,
- createTime: "2022-07-18 17:29:10.000",
- creator: "developer",
- csUrl: "plm.uif.actions.client.EditAction",
- description: "",
- displayMode: "textandimage",
- hidden: false,
- iconPath: "",
- id: "edit",
- lastModifier: "developer",
- lastModifyTime: "2022-07-18 17:29:10.000",
- name: "淇敼",
- oid: "F50F37CE-26FF-8BC1-F87A-FFD9CFA8CE57",
- orderNum: 2,
- paramVOS: {
- form: "DepartmentProcessReviewForm",
- checkNotOperation: "${lcstatus}=Auditing&${lcstatus}=Waiting",
- location: 'menu',
- buttonType: 'text',
- icon: "el-icon-edit",
- buttonMethods: 'edit'
- },
- pkComponent: "D99AD59E-563F-AB7A-F307-794B929114CD",
- pkParentOid: "",
- url: "BaseEditAction#doAction"
- },
- {
- actionVO: {
- actionCls: "",
- actionUsedType: "business",
- bsUrl: "BaseDeleteAction",
- createTime: "2013-11-09 10:33:08.000",
- creator: "1",
- csClass: "plm.uif.actions.client.DeleteAction",
- description: "鍒犻櫎涓氬姟瀵硅薄",
- id: "del",
- lastModifier: "developer",
- lastModifyTime: "2013-11-09 10:33:08.000",
- licensors: null,
- name: "鍒犻櫎",
- oid: "2655E9F0-014B-DFEC-6F92-A6D1C51FDA19"
- },
- areaType: "tab",
- authorization: true,
- children: null,
- createTime: "2022-07-18 17:29:10.000",
- creator: "developer",
- csUrl: "plm.uif.actions.client.DeleteAction",
- description: "",
- displayMode: "textandimage",
- hidden: false,
- iconPath: "",
- id: "del",
- lastModifier: "developer",
- lastModifyTime: "2022-07-18 17:29:10.000",
- name: "鍒犻櫎",
- oid: "A8914C35-721B-A1E3-1EEE-3A9196DF5EC9",
- orderNum: 3,
- paramVOS: {
- owner: "true",
- checkNotOperation: "${lcstatus}=Auditing&${lcstatus}=Waiting",
- state: "Editing",
- location: 'menu',
- buttonType: 'text',
- icon: "el-icon-delete",
- buttonMethods: 'delete'
- },
- pkComponent: "D99AD59E-563F-AB7A-F307-794B929114CD",
- pkParentOid: "",
- url: "BaseDeleteAction"
- },
- {
- actionVO: {
- actionCls: "",
- actionUsedType: "business",
- bsUrl: "BaseStartWorkflowAction#doAction",
- createTime: "2014-03-17 10:14:40.000",
- creator: "developer",
- csClass: "plm.uif.actions.client.LaunchWorkFlowAction",
- description: "鍚姩娴佺▼",
- id: "launchworkflow",
- lastModifier: "developer",
- lastModifyTime: "2014-03-17 10:14:40.000",
- licensors: null,
- name: "鍚姩娴佺▼",
- oid: "56FE9470-AA2B-403B-F029-0A120FC94536"
- },
- areaType: "tab",
- authorization: true,
- children: null,
- createTime: "2022-07-18 17:29:10.000",
- creator: "developer",
- csUrl: "plm.uif.actions.client.LaunchWorkFlowAction",
- description: "",
- displayMode: "textandimage",
- hidden: false,
- iconPath: "",
- id: "launchworkflow",
- lastModifier: "developer",
- lastModifyTime: "2022-07-18 17:29:10.000",
- name: "瀹＄",
- oid: "9963FA86-F146-FBD3-2AC2-51A7AAAAB825",
- orderNum: 4,
- paramVOS: {
- owner: "true",
- autoSubmitFirst: "false",
- flowtemplates: "宸ヨ壓璇勫瀹＄娴佺▼",
- state: "Editing",
- type: "processreview",
- location: 'top',
- buttonMethods: 'form'
- },
- pkComponent: "D99AD59E-563F-AB7A-F307-794B929114CD",
- pkParentOid: "",
- url: "BaseStartWorkflowAction#doAction"
- },
- ]
}
},
computed: {
basicButtonList() {
// const basicColumn = this.butttonList.filter(item => item.id !== 'launchworkflow'); // 棣栧厛杩囨护鍑烘潵鍩虹琛ㄥ崟浜嬩欢鐨勬寜閽�
const basicColumn = this.butttonList;
- if (this.type === 'table') {
+
+ if (this.type === 'form') {
+
+ return basicColumn;
+
+ } else if (this.type === 'table') {
+
const top = basicColumn.filter(item => item.paramVOS.location === 'top' || func.isEmpty(item.paramVOS.location)); // 杩囨护鍑烘潵琛ㄦ牸涓婇潰鍖哄煙灞曠ず鐨勬寜閽�
const menu = basicColumn.filter(item => item.paramVOS.location === 'menu'); // 杩囨护鍑烘潵鎿嶄綔鏍忓睍绀虹殑鎸夐挳
+
return {
top: top,
menu: menu
- }
+ };
}
}
},
methods: {
buttonClick(item) {
- this.$emit('buttonClick',this.scope,item)
+ this.$emit('buttonClick', this.scope, item)
}
}
}
--
Gitblit v1.9.3