three-trees-ui 1.0.46 → 1.0.48

package/lib/three-trees-ui.common.js

@@ -1907,13 +1907,6 @@ const SubPagination = {
 /* unused harmony reexport * */
 
 
-/***/ }),
-
-/***/ "1c3d":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
 /***/ }),
 
 /***/ "1e27":
@@ -2395,7 +2388,7 @@ const Formulas = {
     }
     args.forEach(item => {
       item = Formulas.parseNumber(item);
-      num += item;
+      num = Formulas.floatAdd(num, item);
     });
     return num;
   },
@@ -2775,6 +2768,132 @@ const Formulas = {
     }
     return new Date(Date.parse(str.replace(/-/g, '/')));
   },
+  //格式化
+  toNonExponential(num) {
+    if (num == null) {
+      return num;
+    }
+    if (typeof num == 'number') {
+      var m = num.toExponential().match(/\d(?:\.(\d*))?e([+-]\d+)/);
+      return num.toFixed(Math.max(0, (m[1] || '').length - m[2]));
+    } else {
+      return num;
+    }
+  },
+  // 加
+  floatAdd(arg1, arg2) {
+    arg1 = Number(arg1) || 0;
+    arg2 = Number(arg2) || 0;
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var r1, r2, m;
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    m = Math.pow(10, Math.max(r1, r2));
+    return (Formulas.floatMultiply(arg1, m) + Formulas.floatMultiply(arg2, m)) / m;
+  },
+  // 减
+  floatSub(arg1, arg2) {
+    arg1 = Number(arg1) || 0;
+    arg2 = Number(arg2) || 0;
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var r1, r2, m, n;
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    m = Math.pow(10, Math.max(r1, r2));
+    // 动态控制精度长度
+    n = r1 >= r2 ? r1 : r2;
+    return ((Formulas.floatMultiply(arg1, m) - Formulas.floatMultiply(arg2, m)) / m).toFixed(n);
+  },
+  //乘
+  floatMultiply(arg1, arg2) {
+    arg1 = Number(arg1);
+    arg2 = Number(arg2);
+    if (!arg1 && arg1 !== 0 || !arg2 && arg2 !== 0) {
+      return null;
+    }
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var n1, n2;
+    var r1, r2; // 小数位数
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    n1 = Number(arg1.toString().replace('.', ''));
+    n2 = Number(arg2.toString().replace('.', ''));
+    return n1 * n2 / Math.pow(10, r1 + r2);
+  },
+  //除
+  floatDivide(arg1, arg2) {
+    arg1 = Number(arg1);
+    arg2 = Number(arg2);
+    if (!arg2) {
+      return null;
+    }
+    if (!arg1 && arg1 !== 0) {
+      return null;
+    } else if (arg1 === 0) {
+      return 0;
+    }
+    arg1 = Formulas.toNonExponential(arg1);
+    arg2 = Formulas.toNonExponential(arg2);
+    var n1, n2;
+    var r1, r2; // 小数位数
+    try {
+      r1 = arg1.toString().split('.')[1].length;
+    } catch (e) {
+      r1 = 0;
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length;
+    } catch (e) {
+      r2 = 0;
+    }
+    n1 = Number(arg1.toString().replace('.', ''));
+    n2 = Number(arg2.toString().replace('.', ''));
+    return Formulas.floatMultiply(n1 / n2, Math.pow(10, r2 - r1));
+  },
+  //余
+  floatMod(arg1, arg2) {
+    arg1 = Number(arg1);
+    arg2 = Number(arg2);
+    if (!arg2) {
+      return null;
+    }
+    if (!arg1 && arg1 !== 0) {
+      return null;
+    } else if (arg1 === 0) {
+      return 0;
+    }
+    let intNum = arg1 / arg2;
+    intNum = intNum < 0 ? Math.ceil(arg1 / arg2) : Math.floor(arg1 / arg2); // -1.02 取整为 -1; 1.02取整为1
+    let intVal = Formulas.floatMultiply(intNum, arg2);
+    return Formulas.floatSub(arg1, intVal);
+  },
   getArrayByPath(obj) {
     let array = [];
     if (!obj.data) return array;
@@ -4666,7 +4785,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"1.0.46\"}");
+module.exports = JSON.parse("{\"a\":\"1.0.48\"}");
 
 /***/ }),
 
@@ -6279,17 +6398,6 @@ module.exports = {"primary_color":"#409eff","success_color":"#67c23a","info_colo
 /* unused harmony reexport * */
 
 
-/***/ }),
-
-/***/ "b316":
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_index_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_customDialog_vue_vue_type_style_index_0_id_7e1d5bb0_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("1c3d");
-/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_index_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_customDialog_vue_vue_type_style_index_0_id_7e1d5bb0_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_index_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_customDialog_vue_vue_type_style_index_0_id_7e1d5bb0_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "b377":
@@ -6573,6 +6681,13 @@ module.exports = require("jquery");
 /* unused harmony reexport * */
 
 
+/***/ }),
+
+/***/ "c6d3":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "c812":
@@ -6633,6 +6748,17 @@ module.exports = g;
 /* unused harmony reexport * */
 
 
+/***/ }),
+
+/***/ "cd9a":
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_index_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_customDialog_vue_vue_type_style_index_0_id_2474e48a_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("c6d3");
+/* harmony import */ var _node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_index_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_customDialog_vue_vue_type_style_index_0_id_2474e48a_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_mini_css_extract_plugin_dist_loader_js_ref_8_oneOf_1_0_node_modules_css_loader_index_js_ref_8_oneOf_1_1_node_modules_vue_loader_lib_loaders_stylePostLoader_js_node_modules_sass_loader_dist_cjs_js_ref_8_oneOf_1_2_node_modules_cache_loader_dist_cjs_js_ref_0_0_node_modules_vue_loader_lib_index_js_vue_loader_options_customDialog_vue_vue_type_style_index_0_id_2474e48a_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "cebe":
@@ -23894,7 +24020,8 @@ var mainvue_type_template_id_327e638e_scoped_true_staticRenderFns = []
       dialogData: [],
       total: 0,
       form: {},
-      itemSavestate: {}
+      itemSavestate: {},
+      loadingInstance: null
     };
   },
   methods: {
@@ -23909,12 +24036,16 @@ var mainvue_type_template_id_327e638e_scoped_true_staticRenderFns = []
         this.dialogData = data;
       }
     },
+    closeLoadingInstance() {
+      if (this.loadingInstance) {
+        this.loadingInstance.close();
+      }
+    },
     getDialoglistJson(pagination) {
-      let loadingInstance;
       if (this.isMobile) {
         this.$showLoading();
       } else {
-        loadingInstance = external_element_ui_["Loading"].service({
+        this.loadingInstance = external_element_ui_["Loading"].service({
           fullscreen: true,
           text: '查询中...'
         });
@@ -23927,7 +24058,7 @@ var mainvue_type_template_id_327e638e_scoped_true_staticRenderFns = []
         if (this.isMobile) {
           this.$cancelLoading();
         } else {
-          loadingInstance.close();
+          this.loadingInstance.close();
         }
         const listKey = pagination.listKey ? pagination.listKey : pagination.dsType && pagination.dsType == 'dataSource' ? 'rows' : '';
         if (!listKey) {
@@ -23954,11 +24085,11 @@ var mainvue_type_template_id_327e638e_scoped_true_staticRenderFns = []
         };
         this.setPagination(pageBean);
         this.setTodoRows(rows); //列表数据
-      }).catch(err => {
+      }).catch(() => {
         if (this.isMobile) {
           this.$cancelLoading();
         } else {
-          loadingInstance.close();
+          this.loadingInstance.close();
         }
       });
     },
@@ -24002,18 +24133,18 @@ var mainvue_type_template_id_327e638e_scoped_true_staticRenderFns = []
     }
   }
 });
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6b82e520-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/CustomDialog/src/customDialog.vue?vue&type=template&id=7e1d5bb0&scoped=true&
-var customDialogvue_type_template_id_7e1d5bb0_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('el-dialog',{attrs:{"visible":_vm.customDialogShowList,"title":_vm.customDialog.name,"close-on-click-modal":false,"before-close":_vm.dialogCancel,"append-to-body":"","top":"6vh","width":"75%"},on:{"update:visible":function($event){_vm.customDialogShowList=$event},"opened":_vm.afterOpen}},[_c('el-container',{staticStyle:{"overflow":"auto"},style:(_vm.style)},[(_vm.customDialog.style == 2)?_c('el-aside',{directives:[{name:"show",rawName:"v-show",value:(_vm.treeShow),expression:"treeShow"}],staticStyle:{"width":"23%"}},[_c('el-card',[_c('div',{staticClass:"clearfix",attrs:{"slot":"header"},slot:"header"},[_c('span',{staticStyle:{"font-size":"16px"}},[_vm._v(_vm._s(_vm.leftTreeTitle))])]),_c('el-tree',{ref:"combinationTree",attrs:{"data":_vm.combinationTreeData,"props":_vm.defaultProps,"node-key":_vm.nodeKey,"highlight-current":"","check-on-click-node":true,"lazy":"","load":_vm.loadTree},on:{"node-click":_vm.combiTreeClick}})],1)],1):_vm._e(),(_vm.customDialog.style == 2)?_c('el-divider',{attrs:{"direction":"vertical"}}):_vm._e(),_c('el-container',[(_vm.querysShow)?_c('el-header',{staticClass:"middle-header"},[_vm._l((_vm.conditionBind),function(condition,index){return _c('div',{key:index,staticClass:"search-item"},[_c('p',{attrs:{"title":condition.comment}},[_vm._v(_vm._s(condition.comment)+":")]),(condition.controllerType == '1')?_c('div',{staticClass:"search-item_main"},[_c('el-input',{attrs:{"size":"small","clearable":"","placeholder":_vm.placeholders[index],"prefix-icon":"el-icon-search"},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.searchEnterFun($event)}},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}})],1):_vm._e(),(condition.controllerType == '2')?_c('div',{staticClass:"search-item_main"},_vm._l((condition.config.options),function(itemR,$index1){return _c('el-radio',{key:$index1,attrs:{"label":itemR.key},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}},[_vm._v("\n                "+_vm._s(itemR.value)+"\n              ")])}),1):_vm._e(),(condition.controllerType == '3')?_c('div',{staticClass:"search-item_main"},[(condition.config.choiceType == 'static')?_c('ht-select',{attrs:{"placeholder":_vm.quickSearch,"multiple":condition.config.multiple,"options":condition.config.options},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}}):_c('ht-dictionary',{attrs:{"dickey":condition.config.dic,"filterable":condition.config.filterable},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}})],1):_vm._e(),(condition.controllerType == '4')?_c('div',{staticClass:"search-item_main"},[_c('eip-tag',{attrs:{"tag-key":condition.config.tag,"placeholder":_vm.quickSearch,"filterable":condition.config.filterable,"expand":condition.config.expand},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}})],1):_vm._e(),(condition.controllerType == '6')?_c('div',{staticClass:"search-item_main"},[(condition.condition == 'BETWEEN')?_c('div',{staticClass:"search-item_date"},[_c('ht-date',{attrs:{"format":condition.config.inputFormat.includes('mm:ss')
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"6b82e520-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./packages/CustomDialog/src/customDialog.vue?vue&type=template&id=2474e48a&scoped=true&
+var customDialogvue_type_template_id_2474e48a_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',[_c('el-dialog',{attrs:{"visible":_vm.customDialogShowList,"title":_vm.customDialog.name,"close-on-click-modal":false,"before-close":_vm.dialogCancel,"append-to-body":"","top":"6vh","width":"75%"},on:{"update:visible":function($event){_vm.customDialogShowList=$event},"opened":_vm.afterOpen}},[_c('el-container',{staticStyle:{"overflow":"auto"},style:(_vm.style)},[(_vm.customDialog.style == 2)?_c('el-aside',{directives:[{name:"show",rawName:"v-show",value:(_vm.treeShow),expression:"treeShow"}],staticStyle:{"width":"23%"}},[_c('el-card',[_c('div',{staticClass:"clearfix",attrs:{"slot":"header"},slot:"header"},[_c('span',{staticStyle:{"font-size":"16px"}},[_vm._v(_vm._s(_vm.leftTreeTitle))])]),_c('el-tree',{ref:"combinationTree",attrs:{"data":_vm.combinationTreeData,"props":_vm.defaultProps,"node-key":_vm.nodeKey,"highlight-current":"","check-on-click-node":true,"lazy":"","load":_vm.loadTree},on:{"node-click":_vm.combiTreeClick}})],1)],1):_vm._e(),(_vm.customDialog.style == 2)?_c('el-divider',{attrs:{"direction":"vertical"}}):_vm._e(),_c('el-container',[(_vm.querysShow)?_c('el-header',{staticClass:"middle-header"},[_vm._l((_vm.conditionBind),function(condition,index){return _c('div',{key:index,staticClass:"search-item"},[_c('p',{attrs:{"title":condition.comment}},[_vm._v(_vm._s(condition.comment)+":")]),(condition.controllerType == '1')?_c('div',{staticClass:"search-item_main"},[_c('el-input',{attrs:{"size":"small","clearable":"","placeholder":_vm.placeholders[index],"prefix-icon":"el-icon-search"},nativeOn:{"keyup":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.searchEnterFun($event)}},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}})],1):_vm._e(),(condition.controllerType == '2')?_c('div',{staticClass:"search-item_main"},_vm._l((condition.config.options),function(itemR,$index1){return _c('el-radio',{key:$index1,attrs:{"label":itemR.key},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}},[_vm._v("\n                "+_vm._s(itemR.value)+"\n              ")])}),1):_vm._e(),(condition.controllerType == '3')?_c('div',{staticClass:"search-item_main"},[(condition.config.choiceType == 'static')?_c('ht-select',{attrs:{"placeholder":_vm.quickSearch,"multiple":condition.config.multiple,"options":condition.config.options},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}}):_c('ht-dictionary',{attrs:{"dickey":condition.config.dic,"filterable":condition.config.filterable},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}})],1):_vm._e(),(condition.controllerType == '4')?_c('div',{staticClass:"search-item_main"},[_c('eip-tag',{attrs:{"tag-key":condition.config.tag,"placeholder":_vm.quickSearch,"filterable":condition.config.filterable,"expand":condition.config.expand},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}})],1):_vm._e(),(condition.controllerType == '6')?_c('div',{staticClass:"search-item_main"},[(condition.condition == 'BETWEEN')?_c('div',{staticClass:"search-item_date"},[_c('ht-date',{attrs:{"format":condition.config.inputFormat.includes('mm:ss')
                       ? 'yyyy-MM-dd HH:mm:ss'
-                      : condition.config.inputFormat,"valueFormat":condition.config.inputFormat.includes('mm:ss')
+                      : condition.config.inputFormat,"value-format":condition.config.inputFormat.includes('mm:ss')
                       ? 'yyyy-MM-dd HH:mm:ss'
                       : condition.config.inputFormat},model:{value:(_vm.queryParams[index].startDate),callback:function ($$v) {_vm.$set(_vm.queryParams[index], "startDate", $$v)},expression:"queryParams[index].startDate"}}),_vm._v("\n                至\n                "),_c('ht-date',{attrs:{"format":condition.config.inputFormat.includes('mm:ss')
                       ? 'yyyy-MM-dd HH:mm:ss'
-                      : condition.config.inputFormat,"valueFormat":condition.config.inputFormat.includes('mm:ss')
+                      : condition.config.inputFormat,"value-format":condition.config.inputFormat.includes('mm:ss')
                       ? 'yyyy-MM-dd HH:mm:ss'
                       : condition.config.inputFormat},model:{value:(_vm.queryParams[index].endDate),callback:function ($$v) {_vm.$set(_vm.queryParams[index], "endDate", $$v)},expression:"queryParams[index].endDate"}})],1):_c('ht-date',{attrs:{"format":condition.config.inputFormat.includes('mm:ss')
                     ? 'yyyy-MM-dd HH:mm:ss'
-                    : condition.config.inputFormat,"valueFormat":condition.config.inputFormat.includes('mm:ss')
+                    : condition.config.inputFormat,"value-format":condition.config.inputFormat.includes('mm:ss')
                     ? 'yyyy-MM-dd HH:mm:ss'
                     : condition.config.inputFormat},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}})],1):_vm._e(),(condition.controllerType == '7')?_c('div',{staticClass:"search-item_main"},[(condition.config.alias == 'user')?_c('ht-user-selector-input',{attrs:{"append-to-body":""},on:{"change":function (data) {
                     _vm.queryParams[index][condition.field] = _vm.getSelectId(data)
@@ -24027,7 +24158,7 @@ var customDialogvue_type_template_id_7e1d5bb0_scoped_true_render = function () {
                     _vm.queryParams[index][condition.field] = _vm.getSelectId(data)
                   }}}):_vm._e(),(condition.config.alias == 'dimension')?_c('ht-dimension-selector-input',{attrs:{"append-to-body":""},on:{"change":function (data) {
                     _vm.queryParams[index][condition.field] = _vm.getSelectId(data)
-                  }}}):_vm._e()],1):_vm._e(),(condition.controllerType == '5')?_c('div',{staticClass:"search-item_main"},[_c('ht-custom-dialog',{attrs:{"model-name":condition.config.valueBind,"dialogType":"search","custdialog":{
+                  }}}):_vm._e()],1):_vm._e(),(condition.controllerType == '5')?_c('div',{staticClass:"search-item_main"},[_c('ht-custom-dialog',{attrs:{"model-name":condition.config.valueBind,"dialog-type":"search","custdialog":{
                   name: '请选择',
                   icon: '',
                   custDialog: {
@@ -24039,10 +24170,10 @@ var customDialogvue_type_template_id_7e1d5bb0_scoped_true_render = function () {
                     type: 'custDialog',
                   },
                 }},model:{value:(_vm.queryParams[index][condition.field]),callback:function ($$v) {_vm.$set(_vm.queryParams[index], condition.field, $$v)},expression:"queryParams[index][condition.field]"}})],1):_vm._e()])}),(_vm.conditionBind && _vm.conditionBind.length > 0)?_c('div',{staticClass:"btn-wrap"},[_c('el-button',{staticStyle:{"margin-left":"20px"},attrs:{"size":"small","type":"primary","icon":"el-icon-search"},on:{"click":function($event){return _vm.search(true)}}},[_vm._v("\n              查询\n            ")]),_c('el-button',{attrs:{"size":"small","icon":"el-icon-refresh"},on:{"click":_vm.reset}},[_vm._v("\n              重置\n            ")])],1):_vm._e()],2):_vm._e(),_c('el-main',{ref:"customTableRef",staticClass:"custom-dialog_main"},[_c('el-table',{ref:"orgTable",staticClass:"org-table",staticStyle:{"width":"100%"},attrs:{"data":_vm.dialogData,"stripe":"","border":"","size":"medium","height":_vm.tableHeight},on:{"row-click":_vm.orgRowClick,"selection-change":_vm.orgTableSelection,"select":_vm.onTableSelect,"select-all":_vm.selectAll}},[(_vm.customDialog.selectNum != 1)?_c('el-table-column',{attrs:{"type":"selection","align":"center","width":"55"}}):_vm._e(),(_vm.customDialog.selectNum === 1)?_c('el-table-column',{attrs:{"align":"center","width":"55"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_c('el-radio',{staticClass:"textRadio",attrs:{"label":scope.$index},on:{"selection-change":_vm.orgTableSelection},model:{value:(_vm.tableRadioVal),callback:function ($$v) {_vm.tableRadioVal=$$v},expression:"tableRadioVal"}},[_vm._v("\n                   \n                ")])]}}],null,false,918943478)}):_vm._e(),_c('el-table-column',{attrs:{"type":"index","width":"50","align":"center","label":"序号"}}),_vm._l((_vm.sortDisplayfield),function(field){return _c('el-table-column',{key:field.field,attrs:{"prop":field.field,"label":field.comment,"width":field.width || ''}})})],2)],1),_c('el-footer',[(_vm.customDialog.needPage)?_c('el-row',{staticStyle:{"padding-top":"15px","justify-content":"space-between"},attrs:{"type":"flex","justify":"end"}},[(_vm.customDialog.style == 2)?_c('el-button',{attrs:{"icon":_vm.toggleBtn,"size":"mini","type":"default"},on:{"click":_vm.toggleTree}}):_vm._e(),_c('el-pagination',{attrs:{"small":"","current-page":_vm.pagination.page,"page-sizes":[10, 20, 50, 100],"page-size":_vm.pagination.pageSize,"layout":"total, sizes, prev, pager, next, jumper","total":_vm.total},on:{"size-change":_vm.handleSizeChange,"current-change":_vm.handleCurrentChange}})],1):_vm._e()],1)],1)],1),_c('span',{staticClass:"dialog-footer",staticStyle:{"text-align":"center"},attrs:{"slot":"footer"},slot:"footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.dialogConfirm}},[_vm._v("\n        确认\n      ")]),_c('el-button',{attrs:{"size":"small"},on:{"click":_vm.dialogCancel}},[_vm._v("取 消")])],1)],1),_c('el-dialog',{attrs:{"title":"动态传入参数查询","width":"500px","visible":_vm.dialogVisible,"before-close":_vm.handleClose,"close-on-click-modal":false,"top":"6vh"},on:{"update:visible":function($event){_vm.dialogVisible=$event}}},[_c('table',{staticClass:"form-table",staticStyle:{"margin-left":"20px","width":"90%"},attrs:{"cellspacing":"0","cellpadding":"0","border":"0"}},_vm._l((_vm.conditionfieldTree),function(item,$index){return _c('tbody',{key:$index},[(item.defaultType == '4')?_c('tr',[_c('th',{attrs:{"width":"130px"}},[_vm._v(_vm._s(item.comment)+":")]),_c('td',[(item.type != 'date')?_c('ht-input',{staticStyle:{"width":"100%"},attrs:{"type":"text","placeholder":'请输入' + item.comment,"autocomplete":"off"},model:{value:(item.paramVal),callback:function ($$v) {_vm.$set(item, "paramVal", $$v)},expression:"item.paramVal"}}):_vm._e(),(item.type == 'date')?_c('ht-date',{staticStyle:{"width":"100%"},attrs:{"placeholder":'请输入' + item.comment,"format":"yyyy-MM-dd"},model:{value:(item.paramVal),callback:function ($$v) {_vm.$set(item, "paramVal", $$v)},expression:"item.paramVal"}}):_vm._e()],1)]):_vm._e()])}),0),_c('div',{staticClass:"dialog-footer",attrs:{"slot":"footer"},slot:"footer"},[_c('el-button',{attrs:{"type":"primary"},on:{"click":_vm.handleSave}},[_vm._v("确 定")]),_c('el-button',{on:{"click":_vm.handleClose}},[_vm._v("取 消")])],1)]),_c('el-dialog',{attrs:{"visible":_vm.customDialogShowTree,"title":_vm.customDialog.name,"close-on-click-modal":false,"before-close":_vm.dialogCancelTree,"append-to-body":"","top":"6vh","width":"500px"},on:{"update:visible":function($event){_vm.customDialogShowTree=$event}}},[_c('el-container',{staticStyle:{"overflow":"auto"},style:(_vm.style)},[_c('el-tree',{ref:"tree",staticStyle:{"width":"100%"},attrs:{"data":_vm.props1,"props":_vm.defaultProps,"node-key":_vm.nodeKey,"highlight-current":"","show-checkbox":_vm.customDialog.selectNum === -1,"check-on-click-node":true,"check-strictly":false,"lazy":"","load":_vm.loadTree,"default-expanded-keys":_vm.defaultExpandedKeys},on:{"node-click":_vm.treeClick,"check-change":_vm.getChecked}})],1),_c('span',{staticClass:"dialog-footer",staticStyle:{"text-align":"center"},attrs:{"slot":"footer"},slot:"footer"},[_c('el-button',{attrs:{"size":"small","type":"primary"},on:{"click":_vm.dialogTreeConfirm}},[_vm._v("\n        确认\n      ")]),_c('el-button',{attrs:{"size":"small"},on:{"click":_vm.dialogCancelTree}},[_vm._v("取 消")])],1)],1)],1)}
-var customDialogvue_type_template_id_7e1d5bb0_scoped_true_staticRenderFns = []
+var customDialogvue_type_template_id_2474e48a_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/CustomDialog/src/customDialog.vue?vue&type=template&id=7e1d5bb0&scoped=true&
+// CONCATENATED MODULE: ./packages/CustomDialog/src/customDialog.vue?vue&type=template&id=2474e48a&scoped=true&
 
 // EXTERNAL MODULE: external "jquery"
 var external_jquery_ = __webpack_require__("c5e1");
@@ -25469,6 +25600,7 @@ var external_jquery_default = /*#__PURE__*/__webpack_require__.n(external_jquery
       const this_ = this;
       this_.queryParam = '';
       this.setDialogData([]);
+      this.closeLoadingInstance();
       this_.customDialogShowList = false;
       //判断是否是点击了确认再点击取消的  inputVal没有值则表示直接点击的取消
       if (!this_.inputVal) {
@@ -25875,8 +26007,8 @@ var external_jquery_default = /*#__PURE__*/__webpack_require__.n(external_jquery
 });
 // CONCATENATED MODULE: ./packages/CustomDialog/src/customDialog.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_customDialogvue_type_script_lang_js_ = (customDialogvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/CustomDialog/src/customDialog.vue?vue&type=style&index=0&id=7e1d5bb0&prod&lang=scss&scoped=true&
-var customDialogvue_type_style_index_0_id_7e1d5bb0_prod_lang_scss_scoped_true_ = __webpack_require__("b316");
+// EXTERNAL MODULE: ./packages/CustomDialog/src/customDialog.vue?vue&type=style&index=0&id=2474e48a&prod&lang=scss&scoped=true&
+var customDialogvue_type_style_index_0_id_2474e48a_prod_lang_scss_scoped_true_ = __webpack_require__("cd9a");
 
 // CONCATENATED MODULE: ./packages/CustomDialog/src/customDialog.vue
 
@@ -25889,11 +26021,11 @@ var customDialogvue_type_style_index_0_id_7e1d5bb0_prod_lang_scss_scoped_true_ =
 
 var customDialog_component = normalizeComponent(
   src_customDialogvue_type_script_lang_js_,
-  customDialogvue_type_template_id_7e1d5bb0_scoped_true_render,
-  customDialogvue_type_template_id_7e1d5bb0_scoped_true_staticRenderFns,
+  customDialogvue_type_template_id_2474e48a_scoped_true_render,
+  customDialogvue_type_template_id_2474e48a_scoped_true_staticRenderFns,
   false,
   null,
-  "7e1d5bb0",
+  "2474e48a",
   null
   
 )