From f9a91b50e2f8dfaa2cbdc31276833862d704d84f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 10 七月 2023 10:10:46 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue | 7 +++
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 110 +++++++++++++++++++++++++++++++++++++++++++-----------
2 files changed, 94 insertions(+), 23 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 34279e1..b361ff8 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -7,7 +7,7 @@
<!-- 鍏ㄥ睆缂栬緫-->
<el-button v-if=" attrEditVisible == false && attrFlagChiledren==false" size="small" @click="fullscreenHandle" icon="el-icon-full-screen">鍏ㄥ睆缂栬緫</el-button>
<!-- 楠岃瘉瑙勫垯-->
- <el-button icon="el-icon-info" size="small" @click="rulesVisible=true">楠岃瘉瑙勫垯</el-button>
+ <el-button icon="el-icon-info" size="small" @click="ruleAddHandler">楠岃瘉瑙勫垯</el-button>
<!-- 灞炴�у垎缁�-->
<el-button icon="el-icon-menu" size="small" @click="attrVisibleHandle">灞炴�у垎缁�</el-button>
</el-button-group>
@@ -64,7 +64,7 @@
</div>
</el-dialog>
<!-- 鏋氫妇娉ㄥ叆-->
- <el-dialog :visible.sync="enumVisible" append-to-body title="鏋氫妇娉ㄥ叆">
+ <el-dialog :visible.sync="enumVisible" append-to-body title="鏋氫妇娉ㄥ叆" :before-close="this.enumBeforeClose">
<!-- 娓叉煋琛ㄦ牸鍙婃寜閽� -->
<!-- 娓叉煋琛ㄦ牸鍙婃寜閽� -->
<div>
@@ -103,7 +103,7 @@
<template>
<div style="display: flex;justify-content: right;margin-top: 15px">
<el-button size="small" type="primary" @click="enumAddHandle">淇濆瓨</el-button>
- <el-button size="small" @click="enumVisible=false">鍙栨秷</el-button>
+ <el-button size="small" @click="enumCancell">鍙栨秷</el-button>
</div>
</template>
</div>
@@ -208,6 +208,7 @@
:thisSceneTableData="thisSceneTableData"
:visible.sync="isShowformulaEdit"
@updateFormulaContent="updataFormlaContent"
+ :componentRuleText="componentRuleText"
></formula-editor>
<!-- 鏂板 -->
<el-dialog :visible.sync="addVisible" append-to-body title="浠庝笟鍔＄被鍨嬩腑閫夋嫨灞炴��">
@@ -269,12 +270,12 @@
@blur="saveRows"></el-input>
<el-input-number size="small" controls-position="right" v-if="editingRows === row && editShows== item.prop && item.edit == 'number'" v-model="row[item.prop]"
@blur="saveRows" :style="{width:(item.width-10)+'px'}"></el-input-number>
- <el-select v-model="row[item.prop]" filterable allow-create default-first-option slot="prepend" v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " @focus="DataChangeHandler(item.editConfig,index)">
+ <el-select v-model="row[item.prop]" filterable allow-create default-first-option slot="prepend" v-if="editingRows === row && editShows== item.prop && item.edit == 'select' " @visible-change="DataChangeHandler($event,item.editConfig,index)">
<el-option
v-for="optionItem in item.data"
- :key="optionItem.key"
- :label="optionItem.value"
- :value="optionItem.key">
+ :key="optionItem.dictValue"
+ :label="optionItem.dictValue"
+ :value="optionItem.dictValue">
</el-option>
</el-select>
<el-switch
@@ -292,7 +293,7 @@
<el-button
size="small"
type="text"
- @click.native.prevent="CrudRowDel(scope.row)">
+ @click.native.prevent="CrudRowDel(scope.$index)">
绉婚櫎
</el-button>
</template>
@@ -303,6 +304,7 @@
<script>
import {AttrByBtm, gridCodeClassifyTemplateAttr, batchAddSave, copyto,listByFlag} from '@/api/template/templateAttr'
+import {getList} from "@/api/refer/table";
export default {
name: "attrCrud .vue",
@@ -782,7 +784,8 @@
// 灞炴�ч獙璇佽緭鍏ユ
RulesForm: {
expressionText: "",
- TestContent: ""
+ TestContent: "",
+ ruleRowBds:""
},
//灞炴�ч獙璇佽鍒欓厤缃�
rulesOption: {
@@ -1323,6 +1326,8 @@
},
//鏃堕棿鏍煎紡涓嬫媺妗�
codeDataFlag:false,
+ // 缁勫悎瑙勫崟鍏冩牸缂栬緫鍥炲～
+ componentRuleText:""
}
},
computed:{
@@ -1386,10 +1391,13 @@
},
//鏃堕棿涓嬫媺鏍煎紡
- DataChangeHandler(editConfig,index){
+ DataChangeHandler($event,editConfig,index){
+ let that=this;
+ if(!$event){
+ return;
+ }
listByFlag(editConfig.extraParams).then(res=>{
- console.log(res);
- this.option.column[index].data=res;
+ that.option.column[index].data=res.data.data;
})
},
//灞炴�у垎缁勬寜閽�
@@ -1403,7 +1411,12 @@
},
//灞炴�у垎缁勬彁浜�
attrHandle() {
- this.$set(this.attrRow, 'attributeGroup', this.attrModel)
+ console.log(this.attrSelectList)
+ // this.$set(this.attrRow, 'attributeGroup', this.attrModel)
+ // this.attrSelectList.attributeGroup=this.attrModel
+ this.attrSelectList.forEach(item=>{
+ item.attributeGroup=this.attrModel
+ })
this.attrModel = "";
this.attrVisible = false;
},
@@ -1501,7 +1514,11 @@
CascadeAddHandle() {
let CascadeString = "";
CascadeString = this.selectRowArr.id + (this.selectRowArr.name);
- this.$set(this.attrRow, 'parentCode', CascadeString)
+ if(this.CurrentCell){
+ this.$set(this.CurrentCell, 'parentCode', CascadeString)
+ }else {
+ this.$set(this.attrSelectList[0], 'parentCode', CascadeString)
+ }
this.CascadeVisible = false;
},
//绾ц仈灞炴�ф竻闄�
@@ -1540,7 +1557,6 @@
this.editingRows = row;
this.editShows = column.property;
this.rowOid = row.oid;
- console.log(row,column)
this.CurrentCell=row;
if(column.property == 'referConfig' ){
this.$refs.referConfigFormDialog.isShowReferConfigForm = true;
@@ -1548,11 +1564,27 @@
}else if(column.property == 'classifyInvokeLevelName'){
this.injectVisible=true;
}else if(column.property == 'componentRule'){
+
+ if(this.CurrentCell){
+ this.CurrentCell.componentRule=this.componentRuleText;
+ }
this.isShowformulaEdit = true;
}else if(column.property == 'enumString'){
this.enumVisible=true;
}else if(column.property == 'parentCode'){
+ gridCodeClassifyTemplateAttr({
+ 'conditionMap[classifyTemplateOid]': this.Formlist[0].oid,
+ 'conditionMap[oid_notequal]': this.CurrentCell.oid
+ }).then(res => {
+ console.log(res)
+ this.CascadeData = res.data.data;
+ })
this.CascadeVisible=true;
+ }else if(column.property == 'verifyRule'){
+ this.RulesForm.expressionTextt=this.CurrentCell.verifyRule;
+ this.rulesVisible=true;
+ console.log(this.CurrentCell.verifyRule)
+ console.log(this.RulesForm.expressionText)
}
},
saveRows() {
@@ -1585,6 +1617,14 @@
this.enumVisible = true;
}
},
+ enumBeforeClose(done){
+ this.tableData=[]
+ done()
+ },
+ enumCancell(){
+ this.tableData=[]
+ this.enumVisible=false;
+ },
//鏋氫妇娉ㄥ叆澶氶�夋
handleSelectionChange(row) {
this.enumRow = JSON.parse(JSON.stringify(row));
@@ -1598,7 +1638,8 @@
this.$set(this.CurrentCell, 'enumString', JSON.stringify(this.enumRow));
this.enumVisible = false;
}else {
- this.$set(this.attrRow, 'enumString', JSON.stringify(this.enumRow));
+ this.$set(this.attrSelectList[0], 'enumString', JSON.stringify(this.enumRow));
+ this.tableData=[]
this.enumVisible = false;
}
}
@@ -1607,8 +1648,20 @@
saveRow() {
this.editingRow = null;
},
+ //楠岃瘉瑙勫垯鎸夐挳
+ ruleAddHandler(){
+ if(this.attrSelectList.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹�')
+ }else if(this.attrSelectList.length<1){
+ this.$message.warning('璇烽�夋嫨涓�鎻愭ā鏉垮睘鎬�')
+ }else if(this.attrSelectList.length === 1){
+ this.rulesVisible=true
+ }
+
+ },
//瑙勫垯鏍￠獙锛屽弻鍑昏〃鍗曚簨浠�
handleRulesRowDBLClick(row) {
+ this.ruleRowBds=row.bds
this.RulesForm.expressionText = row.bds
},
// 楠岃瘉瑙勫垯娓呴櫎鍐呭
@@ -1618,11 +1671,20 @@
},
// 楠岃瘉瑙勫垯纭畾
rulesHandle() {
+ if(this.CurrentCell.length>0){
+ this.$set(this.CurrentCell,'verifyRule',this.RulesForm.expressionText)
+ }else {
+ console.log(this.attrSelectList)
+ this.$set(this.attrSelectList[0],'verifyRule',this.RulesForm.expressionText)
+ this.rulesremove()
+ }
this.rulesVisible = false
},
//楠岃瘉瑙勫垯妫�鏌�
rulesExamine() {
- if (this.RulesForm.expressionText.test(this.RulesForm.TestContent)) {
+ console.log(this.RulesForm.expressionText)
+ const regex = new RegExp(this.rulesData.ruleRowBds);
+ if(regex.test(this.RulesForm.TestContent)){
this.$message.success('鏍￠獙鎴愬姛')
}
},
@@ -1633,7 +1695,8 @@
} else if (this.attrSelectList.length < 1) {
this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉挎暟鎹�')
} else if (this.attrSelectList.length === 1) {
- this.injectVisible = true
+ this.injectVisible = true;
+
}
},
//鍒嗙被娉ㄥ叆淇濆瓨
@@ -1648,8 +1711,8 @@
this.$set(this.CurrentCell, "classifyInvokeLevelName", data);
this.$set(this.CurrentCell, "classifyInvokeLevel", JSON.stringify(this.injectOption));
}else {
- this.$set(this.attrRow, 'classifyInvokeLevelName', data);
- this.$set(this.attrRow, 'classifyInvokeLevel', JSON.stringify(this.injectOption));
+ this.$set(this.attrSelectList[0], 'classifyInvokeLevelName', data);
+ this.$set(this.attrSelectList[0], 'classifyInvokeLevel', JSON.stringify(this.injectOption));
}
this.injectVisible = false
},
@@ -1666,13 +1729,14 @@
},
//灞炴�фā鏉胯〃鏍煎崟鍏冩牸鐐瑰嚮浜嬩欢
//琛ㄦ牸鎿嶄綔鏍忓垹闄�
- CrudRowDel(row) {
- this.ProData.splice(row.$index, 1)
+ CrudRowDel(index) {
+ this.ProData.splice(index, 1)
},
//琛ㄦ牸鍒犻櫎
CrudRemove() {
this.attrSelectList.forEach((item)=>{
- this.ProData.splice(item.$index, 1)
+ const index = this.ProData.indexOf(item);
+ this.ProData.splice(index, 1)
})
},
//琛ㄦ牸閲嶇疆
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
index 2bfd2cc..e6e2451 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue
@@ -348,6 +348,10 @@
type: "Boolean",
default: false,
},
+ componentRuleText:{
+ type:String,
+ default: ""
+ },
//鏈満鏅彉閲�
thisSceneTableData: {
type: Array,
@@ -650,6 +654,9 @@
this.isShowformulaEdit = this.visible;
}
},
+ mounted() {
+ this.formulaContent=this.componentRuleText
+ },
methods: {
//鍙屽嚮娣诲姞鍏紡鍐呭
--
Gitblit v1.9.3