From af4655ca7d5e9bdd84991d79ee4696dc06c6e8e6 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期二, 06 六月 2023 17:51:57 +0800
Subject: [PATCH] 修改树参照的options及接口参数组装
---
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 8 +-
Source/UBCS-WEB/src/api/refer/tree.js | 4
Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue | 69 ++++++++++-------
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue | 24 ++++-
Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue | 118 ++++++++++++++++++++++++++---
5 files changed, 169 insertions(+), 54 deletions(-)
diff --git a/Source/UBCS-WEB/src/api/refer/tree.js b/Source/UBCS-WEB/src/api/refer/tree.js
index 2890a9f..7be4948 100644
--- a/Source/UBCS-WEB/src/api/refer/tree.js
+++ b/Source/UBCS-WEB/src/api/refer/tree.js
@@ -2,7 +2,7 @@
export const getTree = (params,url) => {
return request({
- url: url || '/api/ubcs-code/codeClassify/treeCodeClassify',
+ url: url,
method: 'get',
params: {
...params
@@ -12,7 +12,7 @@
export const getLazyTree = (params,url) => {
return request({
- url: url||'/api/ubcs-system/dept/lazy-tree',
+ url: url,
method: 'get',
params: {
...params
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
index 1c1f9bc..9f4450d 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTempalte.vue
@@ -24,11 +24,10 @@
</span>
</template>
<template :slot="item.prop + ''" v-for="item in slotColumnList">
- <!-- <vciWebRefer
+ <vciWebRefer
v-if="item.type == 'refer'"
- :value="item.value"
- :options="item.referConfig || {}"
- ></vciWebRefer> -->
+ :referConfig="item.referConfig || {}"
+ ></vciWebRefer>
</template>
</avue-form>
</div>
@@ -197,7 +196,7 @@
tooltips: "璇疯緭鍏ユ暟瀛�",
type: "text",
unique: false,
- verify: /^[0-9]+$/g,
+ verify: "/[0-9]/",
},
{
comboxKey: null,
@@ -513,8 +512,8 @@
})
.then((res) => {
if (res.status === 200) {
- this.$emit('getFormTemplateEnd', res.data)
this.templateRender(res.data.formDefineVO.items);
+ this.$emit("getFormTemplateEnd", res.data);
}
})
.catch((err) => {
@@ -575,12 +574,25 @@
format: formItem.dateFormate,
keyAttr: formItem.keyAttr,
value: formItem.defaultValue,
+ // tip: formItem.tooltips,
+ // tipPlacement: "right",
placeholder: formItem.inputTip,
comboxKey: formItem.comboxKey,
display: !formItem.hidden,
maxlength: formItem.maxlength,
filterable: true,
- referConfig: formItem.referConfig,
+ referConfig:formItem.type=='refer'?{
+ title:formItem.text,
+ showField:formItem.showField || formItem.field,
+ field: formItem.field,
+ placeholder: formItem.inputTip,
+ options:formItem.referConfig,
+ value:'',
+ text:''
+ }:{},
+ change: () => {
+ this.changeFun(formItem.displayExtension, formItem.prop);
+ },
span: formItem.type === "textarea" ? 24 : this.trendsSpan,
rules: [
{
@@ -613,7 +625,7 @@
this.formIndex++;
this.loading = false;
this.geDictData(dictKeys);
- this.getFormDetail();
+ this.getFormDetail()
},
// 浣跨敤浼犲叆鐨勮〃鍗曟暟鎹厤缃�
resetFormConfig(formItem) {
@@ -660,6 +672,11 @@
return val;
}
},
+ changeFun(displayExtension, prop) {
+ // executeCode({displayExtension, data: this.form}).then(res => {
+ // this.form[prop] = res.data.data
+ // })
+ },
// 鑾峰彇swich鍜屽凡鎷垮埌鐨勪笅鎷夋暟鎹�
getDataList(type, dicData) {
if (type === "truefalse") {
@@ -699,30 +716,26 @@
});
},
// 琛ㄥ崟鏍￠獙
- validate() {
+ validate() {
return new Promise((resolve) => {
this.$refs.form.validate((valid, done, msg) => {
- console.error(msg, valid);
- if (valid) {
- done();
- resolve(true);
- } else {
- resolve(false);
- }
- });
- });
- },
- // 鑾峰彇琛ㄥ崟璇︽儏鏁版嵁
- getFormDetail() {
- if (this.type === 'add') return
- if (this.type === "add") return;
- getFormDetail({ templateOid: this.templateOid, oid: this.rowOid }).then(
- (res) => {
- this.form = Object.assign(this.form, res.obj)
- console.log(res, "res");
+ console.error(msg, valid)
+ if (valid) {
+ resolve(true)
+ } else {
+ resolve(false);
}
- );
+ });
+ })
+
},
+ // 鑾峰彇琛ㄥ崟鏁版嵁
+ getFormDetail() {
+ if (this.type === 'add') return
+ getFormDetail({templateOid: this.templateOid, oid: this.rowOid}).then(res => {
+ console.log(res, 'res');
+ })
+ }
},
watch: {
// 琛ㄥ崟鏁版嵁淇敼鍙嶉鍒扮埗缁勪欢
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
index 9d6f311..8049591 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -1,26 +1,38 @@
<template>
- <vciWebReferTree v-if="refertype=='tree'" :value="value" :options="options"></vciWebReferTree>
- <vciWebReferTable v-else-if="refertype=='table'" :value="value" :options="options"></vciWebReferTable>
- <vciWebReferDefalut v-else :value="value" :options="options"></vciWebReferDefalut>
+ <vciWebReferTree v-if="refertype=='tree'" :value="value" :referConfig="referConfig"></vciWebReferTree>
+ <vciWebReferTable v-else-if="refertype=='table'" :value="value" :referConfig="referConfig"></vciWebReferTable>
+ <vciWebReferDefalut v-else :value="value" :referConfig="referConfig"></vciWebReferDefalut>
</template>
<script>
import vciWebReferTree from "./vciWebReferTree.vue";
import vciWebReferTable from "./vciWebReferTable.vue";
import vciWebReferDefalut from "./vciWebReferTable.vue";
+import {validatenull} from "@/util/validate";
export default {
name: "vciWebRefer",
- props:["options","value"],
+ props:["referConfig"],
components: { vciWebReferTree,vciWebReferTable,vciWebReferDefalut},
data() {
return {
- refertype:this.options.type
+ refertype: this.referConfig.options.type,
+ isMuti: ("true" == this.referConfig.options.isMuti || this.referConfig.options.isMuti == true || this.referConfig.options.muti == true) ? true : false,
+ value: this.referConfig.value
};
},
created() {
+ var title =this.referConfig.title || '';
+ title = title.replace(":","");
+ if(title){
+ title = validatenull(this.referConfig.title)?('涓恒��' + title + '銆戦�夊彇鍊�'):this.referConfig.title;
+ }else{
+ title = validatenull(this.referConfig.title)?('涓恒��' + this.referConfig.showField + '銆戦�夊彇鍊�'):this.referConfig.title;
+ }
+ this.referConfig.title= title;
+ this.referConfig.isMuti=this.isMuti
if(this.refertype=='tree'){
console.log('referConfig:')
- console.log(this.options)
+ console.log(this.referConfig)
}
},
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
index 1f1b519..fbcb212 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -5,10 +5,10 @@
<script>
export default {
name: "vciWebReferTable",
- props:["options","value"],
+ props:["referConfig","value"],
data() {
return {
- placeholder:'璇烽�夋嫨鏁版嵁',
+ placeholder:this.referConfig.placeholder || '璇烽�夋嫨鏁版嵁',
column:{
children:{
border: true,
@@ -25,8 +25,8 @@
},
},
props: {
- label: 'name',
- value: 'oid'
+ value: this.referConfig.valueField || this.referConfig.options.valueField || 'oid',
+ label: this.referConfig.textField || this.referConfig.options.textField || "name"
}
};
},
diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
index d506c66..fb1830b 100644
--- a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
+++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue
@@ -1,5 +1,5 @@
<template>
- <avue-input-tree :props="props" :lazy="lazy" :tree-load="treeLoad" :leaf-only="!options.onlyLeaf" :multiple="isMuti" v-model="value" :placeholder="placeholder" :dic="treeData"></avue-input-tree>
+ <avue-input-tree :props="props" :lazy="lazy" :tree-load="treeLoad" :leaf-only="!referConfig.onlyLeaf" :multiple="isMuti" v-model="value" :placeholder="placeholder" :dic="treeData"></avue-input-tree>
</template>
<script>
@@ -7,42 +7,132 @@
export default {
name: "vciWebReferTree",
- props:["options","value"],
+ props:["referConfig","value"],
data() {
return {
- lazy:this.options.loadType == 'node',
- isMuti:this.options.muti,
- placeholder:'璇烽�夋嫨鍐呭',
+ options: this.referConfig.options,
+ lazy: this.referConfig.options.loadType == 'node',
+ isMuti: this.referConfig.isMuti,
+ placeholder: this.referConfig.placeholder || '璇烽�夋嫨鍐呭',
props: {
- value:this.options.valueField || 'oid',
- label:this.options.textField || "name"
+ value: this.referConfig.valueField || this.referConfig.options.valueField || 'oid',
+ label: this.referConfig.textField || this.referConfig.options.textField || "name"
//value:"value",
//label:"title"
},
- treeData:[],
- params:{}
- };
+ treeUrl: this.referConfig.options.url || '',//'/api/ubcs-code/codeClassify/treeCodeClassify',
+ treeData: [],
+ params: {},
+ loadType: {'all': 'all', 'node': 'node'},
+ copyParam: ['btmType', 'lnType', 'toBtmType', 'textField', 'valueField', 'parentFieldName', 'parentValue', 'sort', 'order', 'isDirection', 'whereSql', 'isMuti', 'queryScheme', 'isQueryAllColumn', 'queryColumn', 'split', 'loadType', 'onlyLeaf', 'onlyLeafText', 'parentUsedField']
+ }
},
created() {
this.getParams();
},
mounted() {
if(!this.lazy){
- this.getTree()
+ if(this.options.data){//濡傛灉鏄浐瀹氭暟鎹殑鎯呭喌涓�
+ this.treeData=this.options.data
+ }else{
+ this.getTree()
+ }
}
},
methods: {
getParams:function (){
+ var queryParams = {};
+ debugger;
+ if(this.options.extraParams){
+ queryParams = this.options.extraParams;
+ }
+ for(var i= 0 ; i < this.copyParam.length ; i ++){
+ if(this.copyParam[i] == "btmType") {
+ queryParams[this.copyParam[i]] = this.options['referBo'] || this.options['referType'];
+ }else if(this.copyParam[i] in this.options){
+ queryParams[this.copyParam[i]] = this.options[this.copyParam[i]];
+ }
+ }
+ queryParams['referBo'] = this.options['referBo'] || this.options['referType'];
+ queryParams['selectAllLevel'] = (this.options.loadType == this.loadType.all?true:false);//true鏃跺悗鍙颁細鎶ラ敊
+ if(queryParams.isMuti =="true"){
+ queryParams.muti =true;
+ }
+ if(queryParams.isQueryAllColumn =="true"){
+ queryParams.isQueryAllColumn = true;
+ }
+ if(this.options.useFormKey && this.options.formValues){
+ //浣跨敤琛ㄥ崟涓婄殑瀛楁鏉ヨ繃婊�
+ queryParams['conditionMap["' + (this.options.paramForFormKey?this.options.paramForFormKey:this.options.useFormKey) + '"]'] = this.options.formValues[this.options.useFormKey];
+ }
+ if (!this.options.loadType) {
+ this.options.loadType = this.loadType.node;
+ }
+ queryParams['queryAllLevel'] = this.options.loadType == this.loadType.node? false : true;//榛樿閫愮骇灞曞紑
+ queryParams['loadType'] = this.options.loadType;
+ queryParams['multipleSelect'] = this.isMuti;
+ queryParams['isMuti'] = queryParams['multipleSelect'];
+ if (this.options.remoteSort && this.options.initSort) {
+ queryParams['order'] = this.options.initSort.type;//鏂规硶
+ queryParams['sort'] = this.options.initSort.field;//瀛楁
+ }
+ if (this.options.rootParams) {
+ for (var key in this.options.rootParams) {
+ queryParams[key] = this.options.rootParams[key];
+ }
+ }
+ if (this.options.conditionParams) {
+ //璇存槑鏄墿灞曞睘鎬�
+ for (var key in this.options.conditionParams) {
+ queryParams['conditionMap["' + key + '"]'] = this.options.conditionParams[key];//鏂扮殑鏂瑰紡
+ }
+ }
+ if(this.options.where ) {
+ for (var key in this.options.where) {
+ queryParams['conditionMap["' + key + '"]'] = this.options.where[key];//鏂�
+ }
+ }
+ if (this.options.treeExtandParams) {
+ //璇存槑鏄墿灞曞睘鎬�
+ for (var key in this.options.treeExtandParams) {
+ queryParams['extandParamsMap["' + key + '"]'] = this.options.treeExtandParams[key];//鏂扮殑鏂瑰紡
+ }
+ }
+ if (this.options.sourceDataParams) {
+ //璇存槑鏄墿灞曞睘鎬�
+ for (var key in this.options.sourceDataParams) {
+ if (key && key.constructor === Object) return;
+ queryParams['sourceData["' + key + '"]'] = this.options.sourceDataParams[key];//鏂扮殑鏂瑰紡
+ }
+ }
+ if (this.options.replaceParams) {
+ //璇存槑鏄墿灞曞睘鎬�
+ for (var key in this.options.replaceParams) {
+ if (key && key.constructor === Object) return;
+ queryParams['replaceMap["' + key + '"]'] = this.options.replaceParams[key];//鏂扮殑鏂瑰紡
+ }
+ }
+ this.params=queryParams;
},
getTree(){
- getTree(this.params,this.options.url).then(res => {
+ getTree(this.params,this.treeUrl).then(res => {
this.treeData=res.data
})
},
treeLoad: function (treeNode, resolve) {
- const parentId = (treeNode.level === 0) ? 0 : treeNode.data.id;
- getLazyTree({...this.params,parentId:parentId}).then(res => {
+ const parentOid = (treeNode.level === 0) ? 0 : treeNode.data.oid;
+ this.params.parentOid=parentOid.indexOf('@vcitreesep@') > -1 ? parentOid.split('@vcitreesep@')[1] : parentOid;
+ this.params.parentValue=this.params.parentOid;
+ this.params.parentBtmName=treeNode.data.attributes.btmName || treeNode.data.attributes.btmname;
+ this.params.parentBtmType=this.params.parentBtmName;
+
+ if (this.options.rootParams && treeNode.level !== 0) {
+ for (var key in this.options.rootParams) {
+ delete this.params[key]
+ }
+ }
+ getLazyTree(this.params,this.treeUrl).then(res => {
resolve(res.data.data.map(item => {
return {
...item,
--
Gitblit v1.9.3