From b11b45122d2b6903e8970e8d55712f7a6a657e22 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 10 一月 2024 00:01:10 +0800
Subject: [PATCH] defaultReferDataGrid接口修改,实现兼容高级查询sql拼接;修改流水处理接口,增加流水处理跳出判断

---
 Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue |  919 +++++++++++++++++++++++++++++----------------------------
 1 files changed, 464 insertions(+), 455 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 4f43e79..8c30e40 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -1,11 +1,14 @@
 <template>
     <!-- 绗簩灞傚璇濇,灞炴�х爜娈碉紝鍏紡缂栬緫妗嗗脊绐� -->
     <el-dialog
+      :close-on-click-modal="false"
       title="鍙傜収閰嶇疆"
       append-to-body
       :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">
@@ -16,7 +19,7 @@
                         <el-input :disabled="disabled"
                             :size="size"
                             v-model="form.referTypeName"
-                            ref="referTypeName" 
+                            ref="referTypeName"
                             placeholder="璇烽�夋嫨 鍙傜収鐨勪笟鍔$被鍨�"
                             prefix-icon="el-icon-search"
                             readonly="true"
@@ -28,7 +31,7 @@
                         <el-input :disabled="disabled"
                             :size="size"
                             v-model="form.sortField"
-                            ref="sortField" 
+                            ref="sortField"
                             placeholder="璇烽�夋嫨 鎺掑簭瀛楁"
                             prefix-icon="el-icon-search"
                             readonly="true"
@@ -48,7 +51,7 @@
                                     <el-input :disabled="disabled"
                                         :size="size"
                                         v-model="form.sortField"
-                                        ref="sortField" 
+                                        ref="sortField"
                                         placeholder="璇烽�夋嫨 鎺掑簭瀛楁"
                                         prefix-icon="el-icon-search"
                                         readonly="true"
@@ -109,7 +112,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">
                             <!-- 琛ㄦ牸鍐呮搷浣滄寜閽� -->
@@ -229,15 +232,14 @@
         </el-dialog>
 
     </el-dialog>
-
 </template>
-    
+
 <script>
     import func from "@/util/func";
     export default {
         name: "referConfigFormDialog",
         props: {
-           
+
         },
         data() {
             let element = '';
@@ -312,7 +314,7 @@
                     dialogClickModal: false,
                     highlightCurrentRow: true,
                     indexFixed: false,
-                    menuFixed: false,  
+                    menuFixed: false,
                     column: [
                         {
                             label: "鍒楀瓧娈�(*)",
@@ -417,7 +419,11 @@
                             cell: true,
                             clearable: false,
                             dicData: [
-                                {
+                                {   
+                                    value: '_in', label: '瀛樺湪浜�'
+                                },{
+                                    value: '_notin', label: '涓嶅瓨鍦ㄤ簬'
+                                },{
                                     value: '_like', label: '鍖呭惈'
                                 },{
                                     value: "_notlike", label: "涓嶅寘鍚�",
@@ -471,442 +477,447 @@
         },
         // 琛ㄥ崟鐣岄潰鏄剧ず鍐呭閰嶇疆
         computed: {
-            formOption() {
-                /** 妫�楠屾槸鍚︿负鏁板瓧 */
-                let validateNumber = "";
-                validateNumber = (rule, value,callback) => {
-                    if(/[^\d]/g.test(value)){
-                        callback(new Error('绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�'));
-                    }else {
-                        callback();
+          formOption() {
+            /** 妫�楠屾槸鍚︿负鏁板瓧 */
+            let validateNumber = "";
+            validateNumber = (rule, value, callback) => {
+              if (/[^\d]/g.test(value)) {
+                callback(new Error('绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�'));
+              } else {
+                callback();
+              }
+            };
+            return {
+              submitBtn: false,
+              emptyBtn: false,
+              labelWidth: '145', //榛樿鏍囩瀹藉害
+              group: [
+                {
+                  // 鍩虹琛ㄥ崟淇℃伅灞曠ず鍖哄煙
+                  //display: this.form.type=='default'||this.form.type=='grid',
+                  icon: 'el-icon-info',
+                  label: '蹇呭~鐨勫弬鐓ч厤缃�',
+                  collapse: true,
+                  labelWidth: '115',
+                  prop: 'groupDdefaultOrGrid',
+                  column: [
+                    {
+                      label: '鍙傜収鐨勪笟鍔$被鍨�',
+                      prop: 'referTypeName',
+                      span: 6,
+                      labelWidth: '130',
+                      disabled: this.referTypeIsReadOnly,
+                      clearable: !this.referTypeIsReadOnly,
+                      tip: '鍙傜収鏁版嵁鏌ヨ鐨勪笟鍔$被鍨嬨��',
+                      tipPlacement: 'bottom',
+                      rules: [{
+                        required: true,
+                        message: "(鍙傜収鐨勪笟鍔$被鍨�)蹇呭~椤逛笉鑳戒负绌�",
+                        trigger: ["blur", "change"],
+                      }],
+                    }, {
+                      label: '鏄剧ず鐨勫睘鎬�',
+                      prop: 'textField',
+                      tip: '閫夋嫨鏁版嵁鍚庯紝鏄剧ず鍒板瓧娈典笂鐨勪俊鎭墍灞炵殑灞炴�э紝涓�鑸兘鏄痭ame,濡傛灉鏄涓睘鎬т娇鐢ㄩ�楀彿鍒嗗壊锛屽id,name銆�',
+                      tipPlacement: 'bottom',
+                      span: 6,
+                      value: 'name',
+                      rules: [{
+                        required: true,
+                        message: "(鏄剧ず鐨勫睘鎬�)蹇呭~椤逛笉鑳戒负绌�",
+                        trigger: "blur",
+                      }],
+                    }, {
+                      label: '瀛樺偍鍊肩殑灞炴��',
+                      prop: 'valueField',
+                      tip: '閫夋嫨鏁版嵁鍚庯紝淇濆瓨鍒版暟鎹簱閲岀殑灞炴�э紝涓�鑸兘鏄痮id鎴栬�卛d锛屽鏋滄槸澶氫釜灞炴�т娇鐢ㄩ�楀彿鍒嗗壊锛屽oid ,id',
+                      value: 'oid',
+                      tipPlacement: 'bottom',
+                      span: 6,
+                      rules: [{
+                        required: true,
+                        message: "(瀛樺偍鍊肩殑灞炴��)蹇呭~椤逛笉鑳戒负绌�",
+                        trigger: "blur",
+                      }],
+                    }, {
+                      label: '鍙傜収绐楀彛绫诲瀷',
+                      prop: 'type',
+                      tip: 'default:榛樿鐨勫弬鐓х獥鍙f牱寮�; stand:UI涓婁笅鏂囬厤缃殑鏂瑰紡; classify:鍒嗙被+妗f鐨勬樉绀�; 鑷畾涔夌殑鍙傜収鐩存帴鍐檍s鐨勭粍浠惰矾寰勶紱tree:鏍戝舰灞曠ず;grid:鍒楄〃灞曠ず',
+                      tipPlacement: 'bottom',
+                      span: 6,
+                      value: 'default',
+                      type: 'select',
+                      dicData: [{
+                        label: '榛樿鏍峰紡',
+                        value: 'default'
+                      }, {
+                        label: '骞冲彴閰嶇疆',
+                        value: 'stand'
+                      }, {
+                        label: '鏍戝舰',
+                        value: 'tree'
+                      }, {
+                        label: '鍒楄〃',
+                        value: 'grid'
+                      }, {
+                        label: '閮ㄩ棬鏍�',
+                        value: 'refer/OrgDepartmentRefer'
+                      }, {
+                        label: '閮ㄩ棬鍒楄〃',
+                        value: 'refer/OrgDepartmentGridRefers'
+                      }, {
+                        label: '鐢ㄦ埛',
+                        value: 'refer/SmUserRefer'
+                      }, {
+                        label: '鐢ㄦ埛鍒楄〃',
+                        value: 'refer/SmUserGridRefer'
+                      }, {
+                        label: '瑙掕壊鍒楄〃',
+                        value: 'refer/SmRoleRefer'
+                      }, {
+                        label: '鑱屽姟',
+                        value: 'refer/OrgDutyRefer'
+                      }, {
+                        label: '宸ョ',
+                        value: 'refer/SmWorkTypeRefer'
+                      }, {
+                        label: '娴佺▼妯℃澘',
+                        value: 'refer/WfProcessTemplateRefer'
+                      }],
+                      rules: [{
+                        required: true,
+                        message: "(鍙傜収绐楀彛绫诲瀷)蹇呭~椤逛笉鑳戒负绌�",
+                        trigger: "blur",
+                      }],
+                      change: ({value, column}) => {
+                        // console.log("start",value);
+                        // 澶嶅師琛ㄥ崟,鍥犱负鍏朵粬鍒嗙粍涓鏋滃瓨鍦ㄥ�硷紝鍦ㄥ垏鎹㈡椂,浼氫繚鐣欒緭鍏ョ殑瀛楁鍊兼墍浠ラ渶瑕佽繕鍘�
+                        let addFrom = {};
+                        this.activeName = 'first'; // 榛樿鍒囨崲鑷崇涓�涓猼ab
+                        //鏍规嵁绫诲瀷瀵筬orm琛ㄥ崟灞炴�ц繘琛岃皟鏁�
+                        if (value == 'stand') {
+                          addFrom = {
+                            referContent: '',
+                            displayTable: '',
+                          };
+                          this.isDisabledTabs = false;
+                        } else if (value == 'default' || value == 'grid') {
+                          addFrom = {
+                            limit: 15,
+                            sortField: '',
+                            sortType: 'asc',
+                          };
+                          this.isDisabledTabs = false;
+                        } else if (value == 'tree') {
+                          addFrom = {
+                            parentFieldName: '',
+                            parentUsedField: 'oid',
+                            parentValue: '',
+                            loadType: 'all',
+                            onlyLeaf: false,
+                            sortField: '',
+                            sortType: 'asc',
+                          };
+                          // 涓嶇煡閬撲负浠�涔坱ype涓簍ree鐨勬椂鍊欎細瑙﹀彂涓ゆchange浜嬩欢
+                          // 瀵艰嚧type鍒囨崲澶辫触
+                          this.form.type = 'tree';
+                          this.isDisabledTabs = false;
+                        } else {
+                          this.isDisabledTabs = true;
+                          this.activeName = 'second';
+                        }
+                        // 绫诲瀷鍒囨崲鏃讹紝瀵逛笉闇�瑕佺殑灞炴�ц繘琛岀瓫闄�
+                        this.removeFormAttr.forEach(attr => {
+                          // console.log(attr);
+                          this.$delete(this.form, attr)
+                        })
+                        // 鍚堝苟涓や釜琛ㄥ崟
+                        this.form = Object.assign(addFrom, this.form);
+                        // console.log("endFilter",this.form.type);
+                        // console.log(this.form);
+                      },
+                    }, {
+                      label: '鏄惁鎸佷箙鍖栧弬鐓ч厤缃�',
+                      prop: 'isPersistence',
+                      labelWidth: '142',
+                      tip: 'true:寮�鍚寔涔呭寲锛屽褰撳墠瀹氫箟鐨勫弬鐓ч厤缃繘琛屾寔涔呭寲瀛樺偍锛屼笅娆″彲鐩存帴閫夊彇锛沠alse:浠呭褰撳墠娆$爜娈垫柊澧炵敓鏁堛��',
+                      tipPlacement: 'bottom',
+                      span: 6,
+                      type: 'switch',
+                    }, {
+                      display: this.form.isPersistence || this.form.isPersistence == 'true',
+                      label: '鍙傜収閰嶇疆缂栧彿',
+                      prop: 'id',
+                      tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑缂栧彿銆�',
+                      rules: [{
+                        required: true,
+                        message: "(寮�鍚寔涔呭寲鏃剁紪鍙�)蹇呭~椤逛笉鑳戒负绌�",
+                        trigger: "blur",
+                      }],
+                      span: 6,
+                    }, {
+                      display: this.form.isPersistence || this.form.isPersistence == 'true',
+                      label: '鍙傜収閰嶇疆鍚嶇О',
+                      prop: 'name',
+                      tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑鍚嶇О銆�',
+                      rules: [{
+                        required: true,
+                        message: "(寮�鍚寔涔呭寲鏃跺悕绉�)蹇呭~椤逛笉鑳戒负绌�",
+                        trigger: "blur",
+                      }],
+                      span: 6,
                     }
-                };
-                return {
-                    submitBtn: false,
-                    emptyBtn: false,
-                    labelWidth: '145', //榛樿鏍囩瀹藉害
-                    group: [
-                        {   
-                            // 鍩虹琛ㄥ崟淇℃伅灞曠ず鍖哄煙
-                            //display: this.form.type=='default'||this.form.type=='grid',
-                            icon: 'el-icon-info',
-                            label: '蹇呭~鐨勫弬鐓ч厤缃�',
-                            collapse: true,
-                            labelWidth: '115',
-                            prop: 'groupDdefaultOrGrid',
-                            column: [
-                                {
-                                    label: '鍙傜収鐨勪笟鍔$被鍨�',
-                                    prop: 'referTypeName',
-                                    span: 6,
-                                    labelWidth: '130',
-                                    disabled: this.referTypeIsReadOnly,
-                                    clearable: !this.referTypeIsReadOnly,
-                                    tip: '鍙傜収鏁版嵁鏌ヨ鐨勪笟鍔$被鍨嬨��',
-                                    tipPlacement: 'bottom',
-                                    rules: [{
-                                        required: true,
-                                        message: "(鍙傜収鐨勪笟鍔$被鍨�)蹇呭~椤逛笉鑳戒负绌�",
-                                        trigger: ["blur","change"],
-                                    }],
-                                },{
-                                    label: '鏄剧ず鐨勫睘鎬�',
-                                    prop: 'textField',
-                                    tip: '閫夋嫨鏁版嵁鍚庯紝鏄剧ず鍒板瓧娈典笂鐨勪俊鎭墍灞炵殑灞炴�э紝涓�鑸兘鏄痭ame,濡傛灉鏄涓睘鎬т娇鐢ㄩ�楀彿鍒嗗壊锛屽id,name銆�',
-                                    tipPlacement: 'bottom',
-                                    span: 6,
-                                    value: 'name',
-                                    rules: [{
-                                        required: true,
-                                        message: "(鏄剧ず鐨勫睘鎬�)蹇呭~椤逛笉鑳戒负绌�",
-                                        trigger: "blur",
-                                    }],
-                                },{
-                                    label: '瀛樺偍鍊肩殑灞炴��',
-                                    prop: 'valueField',
-                                    tip: '閫夋嫨鏁版嵁鍚庯紝淇濆瓨鍒版暟鎹簱閲岀殑灞炴�э紝涓�鑸兘鏄痮id鎴栬�卛d锛屽鏋滄槸澶氫釜灞炴�т娇鐢ㄩ�楀彿鍒嗗壊锛屽oid ,id',
-                                    value: 'oid',
-                                    tipPlacement: 'bottom',
-                                    span: 6,
-                                    rules: [{
-                                        required: true,
-                                        message: "(瀛樺偍鍊肩殑灞炴��)蹇呭~椤逛笉鑳戒负绌�",
-                                        trigger: "blur",
-                                    }],
-                                },{
-                                    label: '鍙傜収绐楀彛绫诲瀷',
-                                    prop: 'type',
-                                    tip: 'default:榛樿鐨勫弬鐓х獥鍙f牱寮�; stand:UI涓婁笅鏂囬厤缃殑鏂瑰紡; classify:鍒嗙被+妗f鐨勬樉绀�; 鑷畾涔夌殑鍙傜収鐩存帴鍐檍s鐨勭粍浠惰矾寰勶紱tree:鏍戝舰灞曠ず;grid:鍒楄〃灞曠ず',
-                                    tipPlacement: 'bottom',
-                                    span: 6,
-                                    value: 'default',
-                                    type: 'select',
-                                    dicData: [{
-                                        label: '榛樿鏍峰紡',
-                                        value: 'default'
-                                    }, {
-                                        label: '骞冲彴閰嶇疆',
-                                        value: 'stand'
-                                    }, {
-                                        label: '鏍戝舰',
-                                        value: 'tree'
-                                    }, {
-                                        label: '鍒楄〃',
-                                        value: 'grid'
-                                    }, {
-                                        label: '閮ㄩ棬鏍�',
-                                        value: 'refer/OrgDepartmentRefer'
-                                    }, {
-                                        label: '閮ㄩ棬鍒楄〃',
-                                        value: 'refer/OrgDepartmentGridRefers'
-                                    }, {
-                                        label: '鐢ㄦ埛',
-                                        value: 'refer/SmUserRefer'
-                                    }, {
-                                        label: '鐢ㄦ埛鍒楄〃',
-                                        value: 'refer/SmUserGridRefer'
-                                    }, {
-                                        label: '瑙掕壊鍒楄〃',
-                                        value: 'refer/SmRoleRefer'
-                                    }, {
-                                        label: '鑱屽姟',
-                                        value: 'refer/OrgDutyRefer'
-                                    }, {
-                                        label: '宸ョ',
-                                        value: 'refer/SmWorkTypeRefer'
-                                    }, {
-                                        label: '娴佺▼妯℃澘',
-                                        value: 'refer/WfProcessTemplateRefer'
-                                    }],
-                                    rules: [{
-                                        required: true,
-                                        message: "(鍙傜収绐楀彛绫诲瀷)蹇呭~椤逛笉鑳戒负绌�",
-                                        trigger: "blur",
-                                    }],
-                                    change: ({ value, column }) => {
-                                        // console.log("start",value);
-                                        // 澶嶅師琛ㄥ崟,鍥犱负鍏朵粬鍒嗙粍涓鏋滃瓨鍦ㄥ�硷紝鍦ㄥ垏鎹㈡椂,浼氫繚鐣欒緭鍏ョ殑瀛楁鍊兼墍浠ラ渶瑕佽繕鍘�
-                                        let addFrom = {}; 
-                                        this.activeName = 'first'; // 榛樿鍒囨崲鑷崇涓�涓猼ab
-                                        //鏍规嵁绫诲瀷瀵筬orm琛ㄥ崟灞炴�ц繘琛岃皟鏁�
-                                        if(value == 'stand'){
-                                            addFrom = {
-                                                referContent: '',
-                                                displayTable: '',
-                                            };
-                                            this.isDisabledTabs = false;
-                                        } else if(value == 'default' || value == 'grid'){
-                                            addFrom = {
-                                                limit: 15,
-                                                sortField: '',
-                                                sortType: 'asc',
-                                            };
-                                            this.isDisabledTabs = false;
-                                        } else if(value == 'tree'){
-                                            addFrom = {
-                                                parentFieldName: '',
-                                                parentUsedField: 'oid',
-                                                parentValue: '',
-                                                loadType: 'all',
-                                                onlyLeaf: false,
-                                                sortField: '',
-                                                sortType: 'asc',
-                                            };
-                                            // 涓嶇煡閬撲负浠�涔坱ype涓簍ree鐨勬椂鍊欎細瑙﹀彂涓ゆchange浜嬩欢
-                                            // 瀵艰嚧type鍒囨崲澶辫触
-                                            this.form.type = 'tree';
-                                            this.isDisabledTabs = false;
-                                        }else {
-                                            this.isDisabledTabs = true;
-                                            this.activeName = 'second';
-                                        }
-                                       // 绫诲瀷鍒囨崲鏃讹紝瀵逛笉闇�瑕佺殑灞炴�ц繘琛岀瓫闄�
-                                        this.removeFormAttr.forEach(attr=>{
-                                            // console.log(attr);
-                                            this.$delete(this.form,attr)
-                                        })
-                                        // 鍚堝苟涓や釜琛ㄥ崟
-                                        this.form = Object.assign(addFrom,this.form);
-                                        // console.log("endFilter",this.form.type);
-                                        // console.log(this.form);
-                                    },
-                                },{
-                                    label: '鏄惁鎸佷箙鍖栧弬鐓ч厤缃�',
-                                    prop: 'isPersistence',
-                                    labelWidth: '142',
-                                    tip: 'true:寮�鍚寔涔呭寲锛屽褰撳墠瀹氫箟鐨勫弬鐓ч厤缃繘琛屾寔涔呭寲瀛樺偍锛屼笅娆″彲鐩存帴閫夊彇锛沠alse:浠呭褰撳墠娆$爜娈垫柊澧炵敓鏁堛��',
-                                    tipPlacement: 'bottom',
-                                    span: 6,
-                                    type: 'switch',
-                                },{
-                                    display: this.form.isPersistence | this.form.isPersistence=='true',
-                                    label: '鍙傜収閰嶇疆缂栧彿',
-                                    prop: 'id',
-                                    tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑缂栧彿銆�',
-                                    rules: [{
-                                        required: true,
-                                        message: "(寮�鍚寔涔呭寲鏃剁紪鍙�)蹇呭~椤逛笉鑳戒负绌�",
-                                        trigger: "blur",
-                                    }],
-                                    span: 6,
-                                },{
-                                    display: this.form.isPersistence | this.form.isPersistence=='true',
-                                    label: '鍙傜収閰嶇疆鍚嶇О',
-                                    prop: 'name',
-                                    tip: '璁剧疆璇ュ弬鐓ч厤缃寔涔呭寲瀛樺偍鏃剁殑鍚嶇О銆�',
-                                    rules: [{
-                                        required: true,
-                                        message: "(寮�鍚寔涔呭寲鏃跺悕绉�)蹇呭~椤逛笉鑳戒负绌�",
-                                        trigger: "blur",
-                                    }],
-                                    span: 6,
-                                }
-                                
-                            ]
-                        },
-                        {   
-                            icon: 'el-icon-info',
-                            label: '椤甸潰鍙傛暟閰嶇疆',
-                            collapse: false,
-                            prop: 'webConfig',
-                            column: [
-                                {
-                                    label: '绐楀彛鏄剧ず鐨勯珮搴�',
-                                    prop: 'height',
-                                    tip: '榛樿绌虹潃锛岃缃悗琛ㄧず寮哄埗鏄剧ず杩欐牱鐨勯珮搴�',
-                                    tipPlacement: 'right',
-                                    span: 7,
-                                    rules:[{
-                                        validator: validateNumber,
-                                        message: "绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�",
-                                        trigger: "blur",
-                                    }]
-                                },{
-                                    label: '杩囨护(绾ц仈)灞炴��',
-                                    prop: 'useFormKey',
-                                    tip: '鑾峰彇琛ㄥ崟涓婄殑鍏朵粬灞炴�х殑灞炴�х殑鍊兼潵杩囨护,鎴栬�呬娇鐢ㄦ煇涓睘鎬ф潵绾ц仈閫夋嫨',
-                                    tipPlacement: 'right',
-                                    span: 7,
-                                },{
-                                    label: '杩囨护灞炴�ц姹傚弬鏁�',
-                                    prop: 'paramForFormKey',
-                                    tip: '浣跨敤杩囨护灞炴�ф椂锛屽彂閫佺粰鍚庡彴鐨勮姹傚弬鏁�',
-                                    tipPlacement: 'right',
-                                    span: 7,
-                                },{
-                                    label: '鏄犲皠鍏朵粬灞炴��',
-                                    prop: 'mapFields',
-                                    tip: '閫夋嫨鏁版嵁鍚庯紝灏嗛�夋嫨鐨勬暟鎹嫹璐濆埌琛ㄥ崟閲岀殑鍏朵粬灞炴�э紝涔﹀啓鏍煎紡涓簕褰撳墠琛ㄥ崟涓婄殑灞炴��:閫夋嫨鏁版嵁閲岀殑灞炴��,XXXXx:yyyy}',
-                                    tipPlacement: 'right',
-                                    span: 7,
-                                },{
-                                    label: '鏄惁寮�鍚叏灞�',
-                                    prop: 'isOpenGlobal',
-                                    tip: '寮�鍚叏灞�涔嬪悗瀵瑰叏閮ㄥ弬鐓ч厤缃暟鎹繘琛屾煡璇紝榛樿鏍规嵁绉熸埛杩涜鏌ヨ銆�',
-                                    tipPlacement: 'right',
-                                    type: 'switch',
-                                    span: 7,
-                                },{
-                                    label: '鏄惁澶氶��',
-                                    type: 'switch',
-                                    prop: 'isMuti',
-                                    value: false,
-                                    span: 7,
-                                    row: true,
-                                }
-                            ]
-                        },
-                        {   
-                            icon: 'el-icon-info',
-                            label: '鍚庡彴鍙傛暟閰嶇疆',
-                            collapse: false,
-                            prop: 'backstageConfig',
-                            column: [
-                                {
-                                label: '鑷畾涔夌殑鍚庡彴璺緞',
-                                prop: 'url',
-                                tip: '閫氬父涓虹┖;濡傛灉鏄垪琛紝鍚庡彴蹇呴』杩斿洖DataGrid锛屽鏋滄槸鏍戯紝鍚庡彴蹇呴』杩斿洖List<Tree>',
-                                tipPlacement: 'right',
-                                span: 7,
-                                },{
-                                    label: '鏈嶅姟鐨勫湴鍧�',
-                                    prop: 'backPath',
-                                    tip: '閫氬父涓虹┖锛屽湪鏀寔寰湇鍔℃垨鑰呭垎甯冨紡閮ㄧ讲鐨勬椂鍊欐墠閰嶇疆',
-                                    tipPlacement: 'right',
-                                    span: 7,
-                                },{
-                                    label: '璇锋眰鍚庡彴鐨勫崗璁柟寮�',
-                                    prop: 'method',
-                                    tip: 'HTTP鐨勫崗璁柟寮忥紝鏀寔POST,PUT,GET锛屼竴鑸兘鏄疓ET',
-                                    tipPlacement: 'right',
-                                    span: 7,
-                                    value: 'GET',
-                                    type: 'select',
-                                    dicData: [{
-                                        label:'GET',value: "GET"
-                                    },{
-                                        label:'PUT',value: "PUT"
-                                    },
-                                    {
-                                        label:'POST',value: "POST"
-                                    }],
-                                },
-                            ]
-                        },
-                    ]
-                }
-            },
-            formOtherOption(){
-                return {
-                    // 鍙樺姩鐨勮〃鍗曞尯鍩�
-                    submitBtn: false,
-                    emptyBtn: false,
-                    labelWidth: '145', //榛樿鏍囩瀹藉害
-                    group: [
-                        {   
-                            display: this.form.type=='default'||this.form.type=='grid',
-                            icon: 'el-icon-info',
-                            label: this.form.type=='default' ? '榛樿鍙傜収鐨勯厤缃�(涓嬫柟鍒楄〃)':'鍒楄〃鍙傜収鐨勯厤缃紙涓嬫柟鍒楄〃)',
-                            collapse: true,
-                            prop: 'groupDdefaultOrGrid',
-                            column: [
-                                {
-                                    label: '姣忛〉鏄剧ず鏉℃暟',
-                                    prop: 'limit',
-                                    span: 8,
-                                    tip: '鍒嗛〉鏃舵瘡椤垫樉绀虹殑鏁伴噺锛屼笉鍒嗛〉濉�-1',
-                                    value: 15,
-                                    tipPlacement: 'right',
-                                },{
-                                    label: '鎺掑簭瀛楁',
-                                    prop: 'sortField',
-                                    span: 8,
-                                    tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭瀛楁',
-                                    //clearable: false,
-                                    tipPlacement: 'right',
-                                },{
-                                    label: '鎺掑簭绫诲瀷',
-                                    prop: 'sortType',
-                                    span: 8,
-                                    dicData: [{
-                                        label: '鍗囧簭', value: 'asc'
-                                    }, {
-                                        label: '闄嶅簭', value: 'desc'
-                                    }],
-                                    //value: 'asc',
-                                    type: 'select',
-                                    tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭绫诲瀷',
-                                    tipPlacement: 'right',
-                                }
-                            ]
-                        },
-                        {   
-                            display: this.form.type=='stand',
-                            icon: 'el-icon-info',
-                            label: 'stand(骞冲彴閰嶇疆)鍙傜収',
-                            collapse: true,
-                            prop: 'groupStand',
-                            column: [
-                                {
-                                    label: '鍙傝�冪殑UI涓婁笅鏂�',
-                                    prop: 'referContent',
-                                    span: 8,
-                                    tip: '鍙湁鍙傜収绐楀彛绫诲瀷鏄痵tand鏃舵墠蹇呴』璁剧疆,涓斿湪stand绫诲瀷涓嬫墠鑳界敓鏁�',
-                                    tipPlacement: 'right',
-                                },
-                                {
-                                    label: '骞冲彴鐨勮〃鏍肩紪鍙�',
-                                    prop: 'displayTable',
-                                    span: 8,
-                                    tip: '涓庡弬鐓х殑UI涓婁笅鏂囦簰鏂ワ紝鍙湁鍙傜収绐楀彛绫诲瀷鏄痵tand鏃舵墠蹇呴』璁剧疆锛屼笖鍦╯tand绫诲瀷涓嬫墠鑳界敓鏁�',
-                                    tipPlacement: 'right',
-                                },
-                            ]
-                        },
-                        {   
-                            display: this.form.type=='tree',
-                            icon: 'el-icon-info',
-                            label: '鏍戝舰鍙傜収淇℃伅',
-                            collapse: true,
-                            prop: 'groupTree',
-                            labelWidth: '158',
-                            column: [
-                                {
-                                    label: '鏍戝舰鐨勪笂绾у睘鎬�',
-                                    prop: 'parentFieldName',
-                                    span: 7,
-                                    tip: '鏍戝舰灞曠ず鐨勬椂鍊欙紝涓婁笅绾у叧绯绘煡鎵剧殑灞炴�с��',
-                                    tipPlacement: 'right',
-                                    rules: [{
-                                        required: true,
-                                        message: "(鏍戝舰鐨勪笂绾у睘鎬�)蹇呭~椤逛笉鑳戒负绌�",
-                                        trigger: "blur",
-                                    }],
-                                },{
-                                    label: '涓婄骇灞炴�у�煎搴斿睘鎬�',
-                                    prop: 'parentUsedField',
-                                    span: 7,
-                                    tip: '涓婄骇灞炴�у瓨鍌ㄧ殑鍊�,鏄笂绾ф暟鎹殑浠�涔堝睘鎬с�備竴鑸兘鏄痮id銆�',
-                                    value: 'oid',
-                                    tipPlacement: 'right',
-                                },{
-                                    label: '鏍硅妭鐐圭殑鍊�',
-                                    prop: 'parentValue',
-                                    span: 7,
-                                    tip: '鏍戝舰灞曠ず鐨勬椂鍊欙紝涓婄骇鐨勫�笺��',
-                                    tipPlacement: 'right',
-                                },{
-                                    label: '鏍戝姞杞芥柟寮�',
-                                    prop: 'loadType',
-                                    span: 7,
-                                    value: 'all',
-                                    dicData: [{
-                                        label: '鍏ㄩ儴', value: 'all'
-                                    }, {
-                                        label: '閫愮骇鍔犺浇', value: 'node'
-                                    }],
-                                    type: 'select',
-                                },{
-                                    label: '鎺掑簭瀛楁',
-                                    prop: 'sortField',
-                                    span: 7,
-                                    //type: 'table',
-                                    tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭瀛楁',
-                                    tipPlacement: 'right',
-                                },{
-                                    label: '鎺掑簭绫诲瀷',
-                                    prop: 'sortType',
-                                    span: 7,
-                                    type: 'select',
-                                    value: 'asc',
-                                    dicData: [{
-                                        label: '鍗囧簭', value: 'asc'
-                                    }, {
-                                        label: '闄嶅簭', value: 'desc'
-                                    }],
-                                },{
-                                    label: '鏄惁鍙兘閫夋嫨鍙跺瓙鑺傜偣',
-                                    prop: 'onlyLeaf',
-                                    span: 7,
-                                    value: false,
-                                    type: 'switch',
-                                }
-                            ]
-                        },
-                    ],
-                }
-            },
+
+                  ]
+                },
+                {
+                  icon: 'el-icon-info',
+                  label: '椤甸潰鍙傛暟閰嶇疆',
+                  collapse: false,
+                  prop: 'webConfig',
+                  column: [
+                    {
+                      label: '绐楀彛鏄剧ず鐨勯珮搴�',
+                      prop: 'height',
+                      tip: '榛樿绌虹潃锛岃缃悗琛ㄧず寮哄埗鏄剧ず杩欐牱鐨勯珮搴�',
+                      tipPlacement: 'right',
+                      span: 7,
+                      rules: [{
+                        validator: validateNumber,
+                        message: "绐楀彛鏄剧ず鐨勯珮搴﹀繀椤讳负鏁板�肩被鍨�",
+                        trigger: "blur",
+                      }]
+                    }, {
+                      label: '杩囨护(绾ц仈)灞炴��',
+                      prop: 'useFormKey',
+                      tip: '鑾峰彇琛ㄥ崟涓婄殑鍏朵粬灞炴�х殑灞炴�х殑鍊兼潵杩囨护,鎴栬�呬娇鐢ㄦ煇涓睘鎬ф潵绾ц仈閫夋嫨',
+                      tipPlacement: 'right',
+                      span: 7,
+                    }, {
+                      label: '杩囨护灞炴�ц姹傚弬鏁�',
+                      prop: 'paramForFormKey',
+                      tip: '浣跨敤杩囨护灞炴�ф椂锛屽彂閫佺粰鍚庡彴鐨勮姹傚弬鏁�',
+                      tipPlacement: 'right',
+                      span: 7,
+                    }, {
+                      label: '鏄犲皠鍏朵粬灞炴��',
+                      prop: 'mapFields',
+                      tip: '閫夋嫨鏁版嵁鍚庯紝灏嗛�夋嫨鐨勬暟鎹嫹璐濆埌琛ㄥ崟閲岀殑鍏朵粬灞炴�э紝涔﹀啓鏍煎紡涓簕褰撳墠琛ㄥ崟涓婄殑灞炴��:閫夋嫨鏁版嵁閲岀殑灞炴��,"XXXXx":"yyyy"}',
+                      tipPlacement: 'right',
+                      span: 7,
+                    }, {
+                      label: '鏄惁寮�鍚叏灞�',
+                      prop: 'isOpenGlobal',
+                      tip: '寮�鍚叏灞�涔嬪悗瀵瑰叏閮ㄥ弬鐓ч厤缃暟鎹繘琛屾煡璇紝榛樿鏍规嵁绉熸埛杩涜鏌ヨ銆�',
+                      tipPlacement: 'right',
+                      type: 'switch',
+                      span: 7,
+                    }, {
+                      label: '鏄惁澶氶��',
+                      type: 'switch',
+                      prop: 'isMuti',
+                      value: false,
+                      span: 7,
+                      row: true,
+                    }
+                  ]
+                },
+                {
+                  icon: 'el-icon-info',
+                  label: '鍚庡彴鍙傛暟閰嶇疆',
+                  collapse: false,
+                  prop: 'backstageConfig',
+                  column: [
+                    {
+                      label: '鑷畾涔夌殑鍚庡彴璺緞',
+                      prop: 'url',
+                      tip: '閫氬父涓虹┖;濡傛灉鏄垪琛紝鍚庡彴蹇呴』杩斿洖DataGrid锛屽鏋滄槸鏍戯紝鍚庡彴蹇呴』杩斿洖List<Theme>',
+                      tipPlacement: 'right',
+                      span: 7,
+                    }, {
+                      label: '鏈嶅姟鐨勫湴鍧�',
+                      prop: 'backPath',
+                      tip: '閫氬父涓虹┖锛屽湪鏀寔寰湇鍔℃垨鑰呭垎甯冨紡閮ㄧ讲鐨勬椂鍊欐墠閰嶇疆',
+                      tipPlacement: 'right',
+                      span: 7,
+                    }, {
+                      label: '璇锋眰鍚庡彴鐨勫崗璁柟寮�',
+                      prop: 'method',
+                      tip: 'HTTP鐨勫崗璁柟寮忥紝鏀寔POST,PUT,GET锛屼竴鑸兘鏄疓ET',
+                      tipPlacement: 'right',
+                      span: 7,
+                      value: 'GET',
+                      type: 'select',
+                      dicData: [{
+                        label: 'GET', value: "GET"
+                      }, {
+                        label: 'PUT', value: "PUT"
+                      },
+                        {
+                          label: 'POST', value: "POST"
+                        }],
+                    },
+                  ]
+                },
+              ]
+            }
+          },
+          formOtherOption() {
+            return {
+              // 鍙樺姩鐨勮〃鍗曞尯鍩�
+              submitBtn: false,
+              emptyBtn: false,
+              labelWidth: '145', //榛樿鏍囩瀹藉害
+              group: [
+                {
+                  display: this.form.type == 'default' || this.form.type == 'grid',
+                  icon: 'el-icon-info',
+                  label: this.form.type == 'default' ? '榛樿鍙傜収鐨勯厤缃�(涓嬫柟鍒楄〃)' : '鍒楄〃鍙傜収鐨勯厤缃紙涓嬫柟鍒楄〃)',
+                  collapse: true,
+                  prop: 'groupDdefaultOrGrid',
+                  column: [
+                    {
+                      label: '姣忛〉鏄剧ず鏉℃暟',
+                      prop: 'limit',
+                      span: 8,
+                      tip: '鍒嗛〉鏃舵瘡椤垫樉绀虹殑鏁伴噺锛屼笉鍒嗛〉濉�-1',
+                      value: 15,
+                      rules: [{
+                        required: true,
+                        message: "蹇呭~椤逛笉鑳戒负绌�",
+                        trigger: "blur",
+                      }],
+                      tipPlacement: 'right',
+                    }, {
+                      label: '鎺掑簭瀛楁',
+                      prop: 'sortField',
+                      span: 8,
+                      tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭瀛楁',
+                      //clearable: false,
+                      tipPlacement: 'right',
+                    }, {
+                      label: '鎺掑簭绫诲瀷',
+                      prop: 'sortType',
+                      span: 8,
+                      dicData: [{
+                        label: '鍗囧簭', value: 'asc'
+                      }, {
+                        label: '闄嶅簭', value: 'desc'
+                      }],
+                      //value: 'asc',
+                      type: 'select',
+                      tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭绫诲瀷',
+                      tipPlacement: 'right',
+                    }
+                  ]
+                },
+                {
+                  display: this.form.type == 'stand',
+                  icon: 'el-icon-info',
+                  label: 'stand(骞冲彴閰嶇疆)鍙傜収',
+                  collapse: true,
+                  prop: 'groupStand',
+                  column: [
+                    {
+                      label: '鍙傝�冪殑UI涓婁笅鏂�',
+                      prop: 'referContent',
+                      span: 8,
+                      tip: '鍙湁鍙傜収绐楀彛绫诲瀷鏄痵tand鏃舵墠蹇呴』璁剧疆,涓斿湪stand绫诲瀷涓嬫墠鑳界敓鏁�',
+                      tipPlacement: 'right',
+                    },
+                    {
+                      label: '骞冲彴鐨勮〃鏍肩紪鍙�',
+                      prop: 'displayTable',
+                      span: 8,
+                      tip: '涓庡弬鐓х殑UI涓婁笅鏂囦簰鏂ワ紝鍙湁鍙傜収绐楀彛绫诲瀷鏄痵tand鏃舵墠蹇呴』璁剧疆锛屼笖鍦╯tand绫诲瀷涓嬫墠鑳界敓鏁�',
+                      tipPlacement: 'right',
+                    },
+                  ]
+                },
+                {
+                  display: this.form.type == 'tree',
+                  icon: 'el-icon-info',
+                  label: '鏍戝舰鍙傜収淇℃伅',
+                  collapse: true,
+                  prop: 'groupTree',
+                  labelWidth: '158',
+                  column: [
+                    {
+                      label: '鏍戝舰鐨勪笂绾у睘鎬�',
+                      prop: 'parentFieldName',
+                      span: 7,
+                      tip: '鏍戝舰灞曠ず鐨勬椂鍊欙紝涓婁笅绾у叧绯绘煡鎵剧殑灞炴�с��',
+                      tipPlacement: 'right',
+                      rules: [{
+                        required: true,
+                        message: "(鏍戝舰鐨勪笂绾у睘鎬�)蹇呭~椤逛笉鑳戒负绌�",
+                        trigger: "blur",
+                      }],
+                    }, {
+                      label: '涓婄骇灞炴�у�煎搴斿睘鎬�',
+                      prop: 'parentUsedField',
+                      span: 7,
+                      tip: '涓婄骇灞炴�у瓨鍌ㄧ殑鍊�,鏄笂绾ф暟鎹殑浠�涔堝睘鎬с�備竴鑸兘鏄痮id銆�',
+                      value: 'oid',
+                      tipPlacement: 'right',
+                    }, {
+                      label: '鏍硅妭鐐圭殑鍊�',
+                      prop: 'parentValue',
+                      span: 7,
+                      tip: '鏍戝舰灞曠ず鐨勬椂鍊欙紝涓婄骇鐨勫�笺��',
+                      tipPlacement: 'right',
+                    }, {
+                      label: '鏍戝姞杞芥柟寮�',
+                      prop: 'loadType',
+                      span: 7,
+                      value: 'all',
+                      dicData: [{
+                        label: '鍏ㄩ儴', value: 'all'
+                      }, {
+                        label: '閫愮骇鍔犺浇', value: 'node'
+                      }],
+                      type: 'select',
+                    }, {
+                      label: '鎺掑簭瀛楁',
+                      prop: 'sortField',
+                      span: 7,
+                      //type: 'table',
+                      tip: '鏌ヨ鏁版嵁鏃剁殑鎺掑簭瀛楁',
+                      tipPlacement: 'right',
+                    }, {
+                      label: '鎺掑簭绫诲瀷',
+                      prop: 'sortType',
+                      span: 7,
+                      type: 'select',
+                      value: 'asc',
+                      dicData: [{
+                        label: '鍗囧簭', value: 'asc'
+                      }, {
+                        label: '闄嶅簭', value: 'desc'
+                      }],
+                    }, {
+                      label: '鏄惁鍙兘閫夋嫨鍙跺瓙鑺傜偣',
+                      prop: 'onlyLeaf',
+                      span: 7,
+                      value: false,
+                      type: 'switch',
+                    }
+                  ]
+                },
+              ],
+            }
+          },
         },
         mounted() {
             // 浜嬩欢鐩戝惉锛屽疄鐜拌〃鏍艰缂栬緫鐐瑰嚮琛ㄦ牸鍖哄煙澶栧唴瀹规椂閫�鍑虹紪杈戠姸鎬�
             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;">
-                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;
                 }
@@ -919,13 +930,12 @@
             },
             // 鐩戝惉鐖剁粍浠朵紶鐨勭獥鍙f樉绀洪殣钘忕殑鍊�
             isShowReferConfigForm (){
-                if(this.isShowReferConfigForm){
+                if(this.isShowReferConfigForm && this.codeShowFieldConfigVOS.length <= 0){
                     this.onloadAttrData();
                 }
             }
         },
         methods: {
-            
             // 閫夋嫨瀹屽弬鐓ч厤缃箣鍚庣偣鍑讳繚瀛樻寜閽Е鍙�
             async selectedListReferConfig(){
                 // 鏍囪鎵�鏈夎〃鍗曟槸鍚﹂�氳繃鏍¢獙鐨勫彉閲�
@@ -939,8 +949,7 @@
                                 break;
                             }
                             isValid = false;
-                            //console.log(valid);
-                        }                            
+                        }
                         done();
                     })
                 })
@@ -948,7 +957,6 @@
                 if (isValid) {
                     // 鏍规嵁绫诲瀷瀵筬orm琛ㄥ崟涓殑鍙傛暟杩涜杩囨护锛屽彧淇濈暀闈炵┖涓旈渶瑕佺殑灞炴��
                     let submitForm = this.filterForm();
-                    // console.log(submitForm);
                     this.$emit('echoReferConfig', submitForm) // 瑙﹀彂update:data灏嗗瓙缁勪欢鍊间紶閫掔粰鐖剁粍浠�
                     this.isShowReferConfigForm = false;
                 }
@@ -956,7 +964,6 @@
             // 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
             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;
@@ -965,7 +972,7 @@
             // 灞炴�ц〃鏍艰缂栬緫澶卞幓鐒︾偣鏃朵繚瀛樻柟娉�
             // updateAttrBlur(value){
                 //console.log(this.codeShowFieldConfigVOS[0]);
-                
+
             // },
 
             // 鍗曞嚮琛ㄦ牸瀹炵幇琛ㄦ牸琛岀紪杈�
@@ -982,6 +989,7 @@
                 // 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)){
@@ -1048,11 +1056,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(){
@@ -1070,8 +1080,8 @@
                     'useFormKey',
                     'paramForFormKey',
                     'isMuti',
-                    'mapFields', 
-                    'codeSrchCondConfigVOS', 
+                    'mapFields',
+                    'codeSrchCondConfigVOS',
                     'isOpenGlobal', //鏄惁寮�鍚叏灞�
                     'isPersistence',
                 ];
@@ -1084,9 +1094,9 @@
                     addArray = ['limit', 'sortField', 'sortType'];
                 } else if(oldForm.type == 'tree'){
                     addArray = [
-                        "parentFieldName", 
+                        "parentFieldName",
                         'parentUsedField',
-                        'parentValue', 
+                        'parentValue',
                         'loadType',
                         'onlyLeaf',
                         'sortField',
@@ -1094,7 +1104,7 @@
                     ];
                 }
                 // 寮�鍚寔涔呭寲鍙傜収閰嶇疆
-                if(oldForm.isPersistence=='true' | oldForm.isPersistence){
+                if(oldForm.isPersistence=='true' || oldForm.isPersistence){
                     submittDefaultForm =  submittDefaultForm.concat(['id','name'])
                 }
                 submittDefaultForm = submittDefaultForm.concat(addArray);
@@ -1111,7 +1121,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);
@@ -1183,7 +1193,7 @@
                 this.$refs[this.selectedBtmTypeAttrParams.ref].selectedBtmTypeAttrOnLoad(params);
                 this.selectedBtmTypeAttrParams.selectedBtmTypeAttrSettingBox = true;
             },
-            
+
             /** 涓恒�愬弬鐓у紩鐢ㄧ殑涓氬姟绫诲瀷銆戦�夊彇鍊间箣鍚庣殑鍐呭鍥炴樉鏃惰皟鐢� */
             echoReferBtmType(content){
                 // 瀹炵幇鍥炴樉
@@ -1202,7 +1212,7 @@
                             {
                                 filterField: item.id,
                                 filterType: '_equal',
-                                filterTypeText: item.name, 
+                                filterTypeText: item.name,
                                 filterValue: '',
                                 $cellEdit: false
                             }
@@ -1231,7 +1241,6 @@
                 }
             },
 
-
         }
     };
 </script>
@@ -1253,5 +1262,5 @@
         -webkit-transition:opacity .0s !important;
         transition:opacity .0s !important;
     }
-    
-</style>
\ No newline at end of file
+
+</style>

--
Gitblit v1.9.3