From 107edc1584cd8e89a0f85b8fdc120194d1858934 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 25 四月 2024 15:32:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue | 131 +++++++++++++++++++++++++++++++++++++------
1 files changed, 113 insertions(+), 18 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
index 52bf1b5..caaaf14 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-button.vue
@@ -39,16 +39,33 @@
{{ item.name }}
</el-button>
</div>
+ <div v-else-if="type === 'tree'" class="tree-buttons">
+ <el-button v-for="item in basicButtonList"
+ :key="item.oid"
+ :icon="item.paramVOS.webUiButtonIcon"
+ :type="(item.paramVOS.webUiButtonType !== 'text' ? item.paramVOS.webUiButtonType : 'primary') || 'primary'"
+ plain
+ size="small"
+ @click="buttonClick(item)">
+ {{ item.name }}
+ </el-button>
+ </div>
</div>
</template>
<script>
import func from "@/util/func";
import {validatenull} from "@/util/validate";
+import {doAction} from '@/actions/base/BaseAction';
+import Vue from "vue";
export default {
name: "dynamic-button",
props: {
+ componentVO: {
+ type: Object,
+ default: {}
+ },
type: {
type: String
},
@@ -61,13 +78,19 @@
butttonList: {
type: Array
},
- selectList: {
+ default:{
+ type:String,
+ },
+ sourceData: {
+ //鎸夐挳鎵�灞炲尯鍩熺殑涓婁竴鍖哄煙閫変腑鏁版嵁
+ type: Object,
+ default: {}
+ },
+ dataStore: {
+ //鎸夐挳鎵�灞炲尯鍩熼�変腑鏁版嵁
type: Array,
default: []
},
- default:{
- type:String,
- }
},
data() {
return {
@@ -239,12 +262,19 @@
computed: {
basicButtonList() {
const basicColumn = this.butttonList;
+ if (!basicColumn || !Array.isArray(basicColumn)) {
+ return []; // 濡傛灉 basicColumn 鏈畾涔夋垨鑰呬笉鏄暟缁勶紝杩斿洖绌烘暟缁�
+ }
- if (this.type === 'form') {
+ if (this.type === 'form' || this.type === 'tree') {
return basicColumn;
} else if (this.type === 'table' || this.type === 'TreeTable') {
- const top = basicColumn.filter(item => item.paramVOS.webUiButtonLocation === 'top' || func.isEmpty(item.paramVOS.webUiButtonLocation)); // 杩囨护鍑烘潵琛ㄦ牸涓婇潰鍖哄煙灞曠ず鐨勬寜閽�
- const menu = basicColumn.filter(item => item.paramVOS.webUiButtonLocation === 'menu'); // 杩囨护鍑烘潵鎿嶄綔鏍忓睍绀虹殑鎸夐挳
+ const top = basicColumn.filter(item => {
+ return item.paramVOS && (item.paramVOS.webUiButtonLocation === 'top' || func.isEmpty(item.paramVOS.webUiButtonLocation));
+ });
+ const menu = basicColumn.filter(item => {
+ return item.paramVOS && item.paramVOS.webUiButtonLocation === 'menu';
+ });
return {
top: top,
menu: menu,
@@ -254,23 +284,87 @@
},
methods: {
//琛ㄦ牸鏍戦粯璁ゆ柊澧炲瓙椤�
- handleDefaultAddChildren(row){
+ handleDefaultAddChildren(row) {
this.visible = true;
this.formName = '鏂板瀛愮骇'
this.$refs.dynamicForm.form = row;
},
buttonClick(item) {
- // 鏍规嵁 type 鏉′欢鍔ㄦ�佸紩鍏ヤ笉鍚岀殑JS鏂囦欢锛屽苟浼犻�� item this 鍙傛暟
- if (this.type === 'table') {
- import('@/views/base/buttonTable').then(module => {
- const buttonClickTable = module.default;
- buttonClickTable.buttonClick(item,this);
+ const paramVOS=item.paramVOS;
+ const DefineVO = this.componentVO.treeDefineVO || this.componentVO.tableDefineVO || this.componentVO.treeTableDefineVO || this.componentVO.formDefineVO;
+ if (!paramVOS['title']) {
+ paramVOS['title'] = item.name + (DefineVO.title || DefineVO.componentTitle || '');
+ }
+
+ if (!paramVOS['type']) {
+ paramVOS['type'] = DefineVO.btmType;
+ }
+ for(let item in paramVOS) {
+ if (item.includes('.${') && item.includes('}')) {
+ //鏇挎崲鎴愭簮鏁版嵁涓殑鍊�
+ if (Object.keys(this.sourceData).length === 0) {
+ this.$message.error("璇峰厛閫夋嫨涓�鏉℃潵婧愭暟鎹�");
+ return false;
+ }
+ item=item.replace(/:/g,'=');
+ let values = item.split(';');
+ let initValues = []
+ } else if (item.includes('${') && item.includes('}')) {
+ //鏇挎崲鎴愰�変腑鏁版嵁鐨勫��
+ if (this.dataStore.length < 1) {
+ this.$message.error("璇峰厛閫夋嫨涓�鏉℃暟鎹�");
+ return false;
+ }
+ item=item.replace(/:/g,'=');
+ }
+ }
+ paramVOS['initvalue']=paramVOS['initvalue'] || paramVOS['initValue'];
+ let isShow = true;
+ if (paramVOS['initvalue']) {
+ let values = paramVOS['initvalue'].split(';');
+ let initValues = {}
+ values.forEach((i, item) => {
+ item = item.replace(':', '=');
+ if (item.indexOf('${') > -1) {
+ if (item.split('=')[1].indexOf('.') > -1) {
+ if (this.sourceData.length < 1 || !this.sourceData.oid) {
+ isShow = false;
+ this.$message.error("璇峰厛閫夋嫨涓�鏉℃潵婧愭暟鎹�");
+ return false;
+ }
+ let name = item.split('=')[1].split('.')[1].replace('${', '').replace('}', '');
+ initValues[item.split('=')[0]] = this.sourceData[name]
+ } else {
+ if (this.dataStore.length < 1) {
+ isShow = false;
+ this.$message.error("璇峰厛閫夋嫨涓�鏉℃暟鎹�");
+ return false;
+ }
+ let name = item.split('=')[1].replace('${', '').replace('}', '');
+ initValues[item.split('=')[0]] = this.dataStore[0][name];
+
+ }
+ }
})
- } else if (this.type === 'form') {
- import('@/views/base/buttonForm').then(module => {
- const buttonClickForm = module.default;
- buttonClickForm.buttonClick(item,this);
- })
+ paramVOS['initvalue'] = initValues
+ }
+ if(paramVOS['BSContent'] || paramVOS['BSContext']){
+ paramVOS['context']=paramVOS['BSContext'] || paramVOS['BSContent']
+ paramVOS['content']=paramVOS['BSContext'] || paramVOS['BSContent'];
+ }
+
+ const that=this;
+ if(isShow){
+ doAction(item, {
+ paramVOS: paramVOS,
+ dataStore: this.dataStore || [],
+ sourceData: this.sourceData || {},
+ callback: function () {
+ if (that.$parent.handleRefresh) {
+ that.$parent.handleRefresh()
+ }
+ }
+ });
}
}
},
@@ -280,3 +374,4 @@
<style scoped>
</style>
+
--
Gitblit v1.9.3