From caeb0c1b3666655e2e05292c2fcaef82a9808cd1 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 08 九月 2023 20:07:20 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 216 ++++++++++++++++++++++++++++-------------------------
1 files changed, 113 insertions(+), 103 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index c5ffdba..134682f 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -6,6 +6,9 @@
:visible.sync="isShowReferConfigForm"
width="90%"
id="refer-config-form"
+ top="0"
+ class= "avue-dialog avue-dialog--top"
+ destroy-on-close
@close="recoveryDataAndForm('initData')"
style="height: 115vh; margin-top: -14vh; overflow-y: hidden">
<div style="width: 100%; overflow-y: auto; height: 70vh">
@@ -15,7 +18,7 @@
<el-input :disabled="disabled"
:size="size"
v-model="form.referTypeName"
- ref="referTypeName"
+ ref="referTypeName"
placeholder="璇烽�夋嫨 鍙傜収鐨勪笟鍔＄被鍨�"
prefix-icon="el-icon-search"
readonly="true"
@@ -27,7 +30,7 @@
<el-input :disabled="disabled"
:size="size"
v-model="form.sortField"
- ref="sortField"
+ ref="sortField"
placeholder="璇烽�夋嫨 鎺掑簭瀛楁"
prefix-icon="el-icon-search"
readonly="true"
@@ -47,7 +50,7 @@
<el-input :disabled="disabled"
:size="size"
v-model="form.sortField"
- ref="sortField"
+ ref="sortField"
placeholder="璇烽�夋嫨 鎺掑簭瀛楁"
prefix-icon="el-icon-search"
readonly="true"
@@ -108,7 +111,7 @@
<span slot="label"><i class="el-icon-search"></i>娣诲姞鏌ヨ鏉′欢</span>
<avue-crud
ref="crudAddCondition"
- :option="addSearchCondtionOption"
+ :option="addSearchCondtionOption"
@cell-click="clickAddSearchCondtionEdit"
:data="form.codeSrchCondConfigVOS">
<!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
@@ -230,12 +233,13 @@
</el-dialog>
</template>
-
+
<script>
import func from "@/util/func";
export default {
- name: "referConfigDialog",
+ name: "referConfigFormDialog",
props: {
+
},
data() {
let element = '';
@@ -244,6 +248,7 @@
labelWidth: '150', // 鏍囬瀹藉害
isShowReferConfigForm: false, // 绗竴灞傚璇濇鏄剧ず闅愯棌鎺у埗
referTypeIsReadOnly: false,
+
// 琛ㄥ崟瀵硅薄
form: {
referTypeName: '', //鏄剧ず鐨勫��
@@ -309,20 +314,20 @@
dialogClickModal: false,
highlightCurrentRow: true,
indexFixed: false,
- menuFixed: false,
+ menuFixed: false,
column: [
{
label: "鍒楀瓧娈�(*)",
prop: "field",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鍒楀悕(*)",
prop: "title",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "瀛楁绫诲瀷(*)",
prop: "fieldTypeText",
@@ -343,7 +348,7 @@
}, {
value: 'textarea', label: '鏂囨湰鍩�'
}],
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鍒楄〃鍙帓搴�",
prop: "sort",
@@ -352,19 +357,19 @@
type:"switch",
width: '80px',
value: true,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鎺掑簭瀛楁",
prop: "attrSortField",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "瀛楁瀹藉害",
prop: "width",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鍒楀浐瀹氫綅缃�",
prop: "fixedPosition",
@@ -373,13 +378,13 @@
clearable: false,
value: 'noFixed',
dicData: [{value: 'noFixed', label: '涓嶅浐瀹�'}, {value: 'left', label: '宸﹁竟'}, {value: 'right', label: '鍙宠竟'}],
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "js鏄剧ず浠ｇ爜",
prop: "templet",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},
]
},
@@ -419,7 +424,7 @@
},{
value: "_notlike", label: "涓嶅寘鍚�",
}, {
- value: 'equal', label: '绛変簬'
+ value: '_equal', label: '绛変簬'
}, {
value: '_notequal', label: '涓嶇瓑浜�'
}, {
@@ -483,7 +488,7 @@
emptyBtn: false,
labelWidth: '145', //榛樿鏍囩瀹藉害
group: [
- {
+ {
// 鍩虹琛ㄥ崟淇℃伅灞曠ず鍖哄煙
//display: this.form.type=='default'||this.form.type=='grid',
icon: 'el-icon-info',
@@ -583,7 +588,7 @@
change: ({ value, column }) => {
// console.log("start",value);
// 澶嶅師琛ㄥ崟,鍥犱负鍏朵粬鍒嗙粍涓鏋滃瓨鍦ㄥ�硷紝鍦ㄥ垏鎹㈡椂,浼氫繚鐣欒緭鍏ョ殑瀛楁鍊兼墍浠ラ渶瑕佽繕鍘�
- let addFrom = {};
+ let addFrom = {};
this.activeName = 'first'; // 榛樿鍒囨崲鑷崇涓�涓猼ab
//鏍规嵁绫诲瀷瀵筬orm琛ㄥ崟灞炴�ц繘琛岃皟鏁�
if(value == 'stand'){
@@ -628,16 +633,18 @@
// console.log(this.form);
},
},{
- label: '鏄惁寮�鍚寔涔呭寲',
+ label: '鏄惁鎸佷箙鍖栧弬鐓ч厤缃�',
prop: 'isPersistence',
+ labelWidth: '142',
tip: 'true:寮�鍚寔涔呭寲锛屽褰撳墠瀹氫箟鐨勫弬鐓ч厤缃繘琛屾寔涔呭寲瀛樺偍锛屼笅娆″彲鐩存帴閫夊彇锛沠alse:浠呭褰撳墠娆＄爜娈垫柊澧炵敓鏁堛��',
tipPlacement: 'bottom',
span: 6,
type: 'switch',
},{
- display: this.form.isPersistence | this.form.isPersistence=='true',
- label: '缂栧彿',
+ display: this.form.isPersistence || this.form.isPersistence=='true',
+ label: '鍙傜収閰嶇疆缂栧彿',
prop: 'id',
+ tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑缂栧彿銆�',
rules: [{
required: true,
message: "(寮�鍚寔涔呭寲鏃剁紪鍙�)蹇呭～椤逛笉鑳戒负绌�",
@@ -645,9 +652,10 @@
}],
span: 6,
},{
- display: this.form.isPersistence | this.form.isPersistence=='true',
- label: '鍚嶇О',
+ display: this.form.isPersistence || this.form.isPersistence=='true',
+ label: '鍙傜収閰嶇疆鍚嶇О',
prop: 'name',
+ tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑鍚嶇О銆�',
rules: [{
required: true,
message: "(寮�鍚寔涔呭寲鏃跺悕绉�)蹇呭～椤逛笉鑳戒负绌�",
@@ -655,10 +663,10 @@
}],
span: 6,
}
-
+
]
},
- {
+ {
icon: 'el-icon-info',
label: '椤甸潰鍙傛暟閰嶇疆',
collapse: false,
@@ -710,7 +718,7 @@
}
]
},
- {
+ {
icon: 'el-icon-info',
label: '鍚庡彴鍙傛暟閰嶇疆',
collapse: false,
@@ -719,7 +727,7 @@
{
label: '鑷畾涔夌殑鍚庡彴璺緞',
prop: 'url',
- tip: '閫氬父涓虹┖;濡傛灉鏄垪琛紝鍚庡彴蹇呴』杩斿洖DataGrid锛屽鏋滄槸鏍戯紝鍚庡彴蹇呴』杩斿洖List<Tree>',
+ tip: '閫氬父涓虹┖;濡傛灉鏄垪琛紝鍚庡彴蹇呴』杩斿洖DataGrid锛屽鏋滄槸鏍戯紝鍚庡彴蹇呴』杩斿洖List<Theme>',
tipPlacement: 'right',
span: 7,
},{
@@ -757,7 +765,7 @@
emptyBtn: false,
labelWidth: '145', //榛樿鏍囩瀹藉害
group: [
- {
+ {
display: this.form.type=='default'||this.form.type=='grid',
icon: 'el-icon-info',
label: this.form.type=='default' ? '榛樿鍙傜収鐨勯厤缃�(涓嬫柟鍒楄〃)':'鍒楄〃鍙傜収鐨勯厤缃紙涓嬫柟鍒楄〃)',
@@ -794,7 +802,7 @@
}
]
},
- {
+ {
display: this.form.type=='stand',
icon: 'el-icon-info',
label: 'stand(骞冲彴閰嶇疆)鍙傜収',
@@ -817,7 +825,7 @@
},
]
},
- {
+ {
display: this.form.type=='tree',
icon: 'el-icon-info',
label: '鏍戝舰鍙傜収淇℃伅',
@@ -896,15 +904,11 @@
this.element = document.getElementById('refer-config-form');
this.element.addEventListener("click", (e) => {
//<table cellspacing="0" cellpadding="0" border="0" class="el-table__body" style="width: 911px;">
- //console.log(e.target);
- // console.log(this.$refs.crudAttr);
- // console.log(this.$refs.crudAttr.$el.contains(e.target));
- //console.log(!this.$refs.crudAttr.$el.contains(e.target) && this.preClickAttrRow != null);
- if (!this.$refs.crudAttr.$el.contains(e.target) &&
+ if (!this.$refs.crudAttr.$el.contains(e.target) &&
this.preClickAttrRow != '') {
this.preClickAttrRow.$cellEdit = false;
}
- if (!this.$refs.crudAddCondition.$el.contains(e.target) &&
+ if (!this.$refs.crudAddCondition.$el.contains(e.target) &&
this.preClickAddSearchConditionRow != '') {
this.preClickAddSearchConditionRow.$cellEdit = false;
}
@@ -914,58 +918,16 @@
// 璐煎潙锛屽垏鎹㈢被鍨嬫椂琛ㄦ牸锛岄殣钘忓啀鏄剧ず灏变細鍑虹幇琛ㄦ牸閿欎綅闂锛�
'form.type'(value) {
this.onloadAttrData();
+ },
+ // 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙ｆ樉绀洪殣钘忕殑鍊�
+ isShowReferConfigForm (){
+ if(this.isShowReferConfigForm && this.codeShowFieldConfigVOS.length <= 0){
+ this.onloadAttrData();
+ }
}
},
methods: {
- // 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
- clickAttrEdit(row, column, event){
- if(this.preClickAttrRow && this.preClickAttrRow != row){
- //console.log(this.codeShowFieldConfigVOS[this.preClickAttrRow.$index]);
- this.codeShowFieldConfigVOS[this.preClickAttrRow.$index].$cellEdit = false;
- }
- row.$cellEdit = true;
- this.preClickAttrRow = row;
- },
- // 灞炴�ц〃鏍艰缂栬緫澶卞幓鐒︾偣鏃朵繚瀛樻柟娉�
- // updateAttrBlur(value){
- //console.log(this.codeShowFieldConfigVOS[0]);
-
- // },
-
- // 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
- clickAddSearchCondtionEdit(row, column, event){
- if(this.preClickAddSearchConditionRow && this.preClickAddSearchConditionRow != row){
- //console.log(this.codeShowFieldConfigVOS[this.preClickAttrRow.$index]);
- this.form.codeSrchCondConfigVOS[this.preClickAddSearchConditionRow.$index].$cellEdit = false;
- }
- row.$cellEdit = true;
- this.preClickAddSearchConditionRow = row;
- },
- //涓婁竴涓〉闈㈠凡缁忛�変腑鍙傜収搴旂敤鐨勪笟鍔＄被鍨嬬殑鎯呭喌锛屽拰涓婁竴娆″凡缁忛厤缃繃鍙傜収閰嶇疆鐨勬儏鍐典笅杩涜椤甸潰鍒濆鍖栨覆鏌�
- initPageData(val){
- //console.log(val);
- if(func.notEmpty(val.referConfig)){
- this.form = JSON.parse(val.referConfig);
- // console.log(this.form);
- this.form.isPersistence = this.form.isPersistence == 'true' ? true:false;
- // 鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬩笉鍙��
- this.referTypeIsReadOnly = true;
- if((this.form.type == 'default' || this.form.type == 'grid') && (this.form.codeShowFieldConfigVOS != undefined && this.form.codeShowFieldConfigVOS.length > 0)){
- this.codeShowFieldConfigVOS = this.form.codeShowFieldConfigVOS;
- }
- return;
- }else {
- this.onloadAttrData()
- }
- if(func.notEmpty(val.referType)){
- this.form.referTypeName = val.referTypeName;
- this.form.referType = val.referType;
- this.referTypeIsReadOnly = true;
- return;
- }
- //console.log(localStorage.getItem("userId"));
- },
// 閫夋嫨瀹屽弬鐓ч厤缃箣鍚庣偣鍑讳繚瀛樻寜閽Е鍙�
async selectedListReferConfig(){
// 鏍囪鎵�鏈夎〃鍗曟槸鍚﹂�氳繃鏍￠獙鐨勫彉閲�
@@ -980,7 +942,7 @@
}
isValid = false;
//console.log(valid);
- }
+ }
done();
})
})
@@ -992,6 +954,53 @@
this.$emit('echoReferConfig', submitForm) // 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
this.isShowReferConfigForm = false;
}
+ },
+ // 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
+ clickAttrEdit(row, column, event){
+ if(this.preClickAttrRow && this.preClickAttrRow != row){
+ //console.log(this.codeShowFieldConfigVOS[this.preClickAttrRow.$index]);
+ this.codeShowFieldConfigVOS[this.preClickAttrRow.$index].$cellEdit = false;
+ }
+ row.$cellEdit = true;
+ this.preClickAttrRow = row;
+ },
+ // 灞炴�ц〃鏍艰缂栬緫澶卞幓鐒︾偣鏃朵繚瀛樻柟娉�
+ // updateAttrBlur(value){
+ //console.log(this.codeShowFieldConfigVOS[0]);
+
+ // },
+
+ // 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
+ clickAddSearchCondtionEdit(row, column, event){
+ if(this.preClickAddSearchConditionRow && this.preClickAddSearchConditionRow != row){
+ //console.log(this.codeShowFieldConfigVOS[this.preClickAttrRow.$index]);
+ this.form.codeSrchCondConfigVOS[this.preClickAddSearchConditionRow.$index].$cellEdit = false;
+ }
+ row.$cellEdit = true;
+ this.preClickAddSearchConditionRow = row;
+ },
+ //涓婁竴涓〉闈㈠凡缁忛�変腑鍙傜収搴旂敤鐨勪笟鍔＄被鍨嬬殑鎯呭喌锛屽拰涓婁竴娆″凡缁忛厤缃繃鍙傜収閰嶇疆鐨勬儏鍐典笅杩涜椤甸潰鍒濆鍖栨覆鏌�
+ initPageData(val){
+ // console.log(val.referConfig);
+ if(func.notEmpty(val.referConfig)){
+ this.form = JSON.parse(val.referConfig);
+ this.form.isPersistence = this.form.isPersistence == 'true'||this.form.isPersistence ? true:false;
+ // 鍙傜収寮曠敤鐨勪笟鍔＄被鍨嬩笉鍙��
+ // this.referTypeIsReadOnly = true;
+ if((this.form.type == 'default' || this.form.type == 'grid') && (this.form.codeShowFieldConfigVOS != undefined && this.form.codeShowFieldConfigVOS.length > 0)){
+ this.codeShowFieldConfigVOS = this.form.codeShowFieldConfigVOS;
+ }
+ return;
+ }else {
+ this.onloadAttrData()
+ }
+ if(func.notEmpty(val.referType)){
+ this.form.referTypeName = val.referTypeName;
+ this.form.referType = val.referType;
+ this.referTypeIsReadOnly = true;
+ return;
+ }
+ //console.log(localStorage.getItem("userId"));
},
/** 鍏跺疄閫夊彇灞炴�ц〃鏍肩殑榛樿鏁版嵁涓嶉渶瑕佸姞杞斤紝
浣嗘槸寮圭獥鎵撳紑浼氭湁琛ㄦ牸閿欒闂鎵�浠ラ渶瑕佸湪杩欒皟鐢╠oLayout鏂规硶*/
@@ -1019,9 +1028,9 @@
$cellEdit: false
}
];
- this.$nextTick(() => {
- this.$refs.crudAttr.doLayout()
- })
+ // this.$nextTick(() => {
+ // this.$refs.crudAttr.doLayout()
+ // })
},
// 灞炴�ч�夋嫨琛ㄦ牸涓殑绉婚櫎鎸夐挳鍔熻兘
removeCurrentRow(row,condition){
@@ -1042,11 +1051,13 @@
// this.form.displayTable = '';
return;
}
- Object.assign(this.$data,this.$options.data());
+ Object.assign(this.$data,this.$options.data());
+ //this.preClickAttrRow.$cellEdit = false;
+ //console.log(this.preClickAttrRow.$cellEdit);
// 绉婚櫎缁戝畾鍦ㄨ椤甸潰瀵硅瘽妗嗕笂鐨勫叏灞�鐩戝惉浜嬩欢
if(this.element != ''){
let te = window.removeEventListener('click', this.element)
- }
+ }
},
// 鎻愪氦琛ㄥ崟涔嬪墠杩囨护鎺夌┖鎴栦笉闇�瑕佺殑琛ㄥ崟鏁版嵁
filterForm(){
@@ -1064,8 +1075,8 @@
'useFormKey',
'paramForFormKey',
'isMuti',
- 'mapFields',
- 'codeSrchCondConfigVOS',
+ 'mapFields',
+ 'codeSrchCondConfigVOS',
'isOpenGlobal', //鏄惁寮�鍚叏灞�
'isPersistence',
];
@@ -1078,9 +1089,9 @@
addArray = ['limit', 'sortField', 'sortType'];
} else if(oldForm.type == 'tree'){
addArray = [
- "parentFieldName",
+ "parentFieldName",
'parentUsedField',
- 'parentValue',
+ 'parentValue',
'loadType',
'onlyLeaf',
'sortField',
@@ -1088,7 +1099,7 @@
];
}
// 寮�鍚寔涔呭寲鍙傜収閰嶇疆
- if(oldForm.isPersistence=='true' | oldForm.isPersistence){
+ if(oldForm.isPersistence=='true' || oldForm.isPersistence){
submittDefaultForm = submittDefaultForm.concat(['id','name'])
}
submittDefaultForm = submittDefaultForm.concat(addArray);
@@ -1105,7 +1116,7 @@
// console.log(!this.checkStringIsEmpty(oldForm[item]) || !this.checkArrayIsUndefined(oldForm[item]));
if((item == 'isMuti' || item == 'onlyLeaf') || (!this.checkStringIsEmpty(oldForm[item]) || !this.checkArrayIsUndefined(oldForm[item]))){
//console.log(item,oldForm[item]);
- newForm = Object.assign(newForm,{[item]:oldForm[item]});
+ newForm = Object.assign(newForm,{[item]:oldForm[item]});
}
});
//console.log(newForm);
@@ -1177,7 +1188,7 @@
this.$refs[this.selectedBtmTypeAttrParams.ref].selectedBtmTypeAttrOnLoad(params);
this.selectedBtmTypeAttrParams.selectedBtmTypeAttrSettingBox = true;
},
-
+
/** 涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
echoReferBtmType(content){
// 瀹炵幇鍥炴樉
@@ -1195,8 +1206,8 @@
this.form.codeSrchCondConfigVOS.push(
{
filterField: item.id,
- filterType: 'equal',
- filterTypeText: item.name,
+ filterType: '_equal',
+ filterTypeText: item.name,
filterValue: '',
$cellEdit: false
}
@@ -1205,7 +1216,7 @@
}else{
// 閫夋嫨鏄剧ず瀛楁
data.selectedArrary.forEach(item => {
- console.log(item);
+ // console.log(item);
this.codeShowFieldConfigVOS.push(
{
field: item.id,
@@ -1224,7 +1235,6 @@
})
}
},
-
}
};
@@ -1247,5 +1257,5 @@
-webkit-transition:opacity .0s !important;
transition:opacity .0s !important;
}
-
-</style>
\ No newline at end of file
+
+</style>
--
Gitblit v1.9.3