three-trees-ui 1.0.34 → 1.0.35

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

@@ -4093,13 +4093,6 @@ const dict = {
 
 /***/ }),
 
-/***/ "6bbb":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "6f28":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -4109,17 +4102,6 @@ const dict = {
 /* unused harmony reexport * */
 
 
-/***/ }),
-
-/***/ "7152":
-/***/ (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_Table_vue_vue_type_style_index_0_id_547c4c80_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("6bbb");
-/* 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_Table_vue_vue_type_style_index_0_id_547c4c80_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_Table_vue_vue_type_style_index_0_id_547c4c80_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "768a":
@@ -4170,6 +4152,17 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACt
 /* unused harmony reexport * */
 
 
+/***/ }),
+
+/***/ "79d0":
+/***/ (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_main_vue_vue_type_style_index_0_id_34c688c8_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("f7c3");
+/* 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_main_vue_vue_type_style_index_0_id_34c688c8_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_main_vue_vue_type_style_index_0_id_34c688c8_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "79d3":
@@ -4264,6 +4257,13 @@ module.exports = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACt
 /* unused harmony reexport * */
 
 
+/***/ }),
+
+/***/ "8263":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "8274":
@@ -4670,7 +4670,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 /***/ "9224":
 /***/ (function(module) {
 
-module.exports = JSON.parse("{\"a\":\"1.0.34\"}");
+module.exports = JSON.parse("{\"a\":\"1.0.35\"}");
 
 /***/ }),
 
@@ -6774,13 +6774,6 @@ module.exports = require("axios");
 
 /***/ }),
 
-/***/ "d3ee":
-/***/ (function(module, exports, __webpack_require__) {
-
-// extracted by mini-css-extract-plugin
-
-/***/ }),
-
 /***/ "d452":
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -7348,17 +7341,6 @@ module.exports = require("html2canvas");
 
 // extracted by mini-css-extract-plugin
 
-/***/ }),
-
-/***/ "f2f4":
-/***/ (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_main_vue_vue_type_style_index_0_id_fdca2abe_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("d3ee");
-/* 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_main_vue_vue_type_style_index_0_id_fdca2abe_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_main_vue_vue_type_style_index_0_id_fdca2abe_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
-/* unused harmony reexport * */
-
-
 /***/ }),
 
 /***/ "f43e":
@@ -7377,6 +7359,17 @@ module.exports = require("js-base64");
 /* unused harmony reexport * */
 
 
+/***/ }),
+
+/***/ "f556":
+/***/ (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_Table_vue_vue_type_style_index_0_id_9aefb486_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("8263");
+/* 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_Table_vue_vue_type_style_index_0_id_9aefb486_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_Table_vue_vue_type_style_index_0_id_9aefb486_prod_lang_scss_scoped_true___WEBPACK_IMPORTED_MODULE_0__);
+/* unused harmony reexport * */
+
+
 /***/ }),
 
 /***/ "f58b":
@@ -7676,6 +7669,13 @@ module.exports = require("js-base64");
 /* unused harmony reexport * */
 
 
+/***/ }),
+
+/***/ "f7c3":
+/***/ (function(module, exports, __webpack_require__) {
+
+// extracted by mini-css-extract-plugin
+
 /***/ }),
 
 /***/ "f8bd":
@@ -8861,17 +8861,17 @@ CommonScripts.install = Vue => {
   Vue.prototype.$CommonScripts = CommonScripts(Vue);
 };
 /* harmony default export */ var commonScripts = (CommonScripts);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ad7f362a-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/Input/src/main.vue?vue&type=template&id=fdca2abe&scoped=true&
-var mainvue_type_template_id_fdca2abe_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.permission !== 'n')?_c('div',{directives:[{name:"express",rawName:"v-express"}],staticClass:"ht-input",class:[
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ad7f362a-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/Input/src/main.vue?vue&type=template&id=34c688c8&scoped=true&
+var mainvue_type_template_id_34c688c8_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return (_vm.permission !== 'n')?_c('div',{directives:[{name:"express",rawName:"v-express"}],staticClass:"ht-input",class:[
     'inputs',
     _vm.formInputsDisplay == 'block'
       ? 'ht-form-inputs__block'
       : 'ht-form-inputs__inline',
-    _vm.company ? 'has-company-box' : '' ]},[(_vm.isShowInput)?_c('el-input',{directives:[{name:"validate",rawName:"v-validate",value:(_vm.inputValidate),expression:"inputValidate"}],ref:"inputEle",style:(_vm.inputWidth),attrs:{"type":_vm.type,"size":_vm.inputSize,"name":_vm.inputName,"placeholder":_vm.placeholder,"clearable":_vm.clearable,"show-password":_vm.showPassword,"disabled":_vm.isDisabled,"readonly":_vm.readonly,"rows":_vm.rowsVal,"cols":_vm.colsVal,"min":_vm.min,"max":_vm.max,"autosize":_vm.autosize,"resize":_vm.resize,"tabindex":_vm.tabindex,"prefix-icon":_vm.prefixIcon,"suffix-icon":_vm.suffixIcon,"minlength":_vm.minlength,"maxlength":_vm.maxlength,"show-word-limit":_vm.showWordLimit},on:{"blur":_vm.handleBlur,"focus":_vm.handleFocus,"change":_vm.handleChange,"input":_vm.handleInput,"clear":_vm.handleClear},model:{value:(_vm.inputVal),callback:function ($$v) {_vm.inputVal=$$v},expression:"inputVal"}},[_vm._t("prefix",null,{"slot":"prefix"}),_vm._t("suffix",null,{"slot":"suffix"}),_vm._t("prepend",null,{"slot":"prepend"}),_vm._t("append",null,{"slot":"append"})],2):_vm._e(),(_vm.inputWriteable && _vm.type == 'number')?[_c('el-input-number',{directives:[{name:"show",rawName:"v-show",value:(_vm.isNumber),expression:"isNumber"},{name:"validate",rawName:"v-validate",value:(_vm.inputValidate),expression:"inputValidate"}],ref:"inputEle",style:(_vm.inputWidth),attrs:{"type":_vm.type,"controls-position":_vm.controlsPosition,"size":_vm.inputSize,"name":_vm.inputName,"placeholder":_vm.placeholder,"clearable":_vm.clearable,"disabled":_vm.disabled,"readonly":_vm.readonly,"min":_vm.min,"max":_vm.max,"step":_vm.step,"step-strictly":_vm.stepStrictly,"precision":_vm.precision},on:{"blur":_vm.handleNumberBlur,"focus":_vm.handleFocus,"change":_vm.handleChange},model:{value:(_vm.inputVal),callback:function ($$v) {_vm.inputVal=$$v},expression:"inputVal"}}),_c('el-input',{directives:[{name:"show",rawName:"v-show",value:(!_vm.isNumber),expression:"!isNumber"}],ref:"exhibit",staticClass:"exhibit",style:(_vm.inputWidth),attrs:{"type":"text","controls-position":_vm.controlsPosition,"size":_vm.inputSize,"name":_vm.inputName,"placeholder":_vm.placeholder,"disabled":_vm.disabled,"readonly":_vm.readonly,"min":_vm.min,"max":_vm.max,"step":_vm.step,"step-strictly":_vm.stepStrictly,"precision":_vm.precision},on:{"focus":_vm.exhibitFocus},model:{value:(_vm.exhibitText),callback:function ($$v) {_vm.exhibitText=$$v},expression:"exhibitText"}}),(_vm.company)?_c('span',[_vm._v(_vm._s(_vm.company))]):_vm._e()]:_vm._e(),(_vm.isShowText)?_c('ht-field-tail',{attrs:{"field-name":_vm.inputName,"readonly":!_vm.inputWriteable,"input-value":_vm.readOnlyInputVal,"company":_vm.company,"precision":_vm.precision,"type":_vm.type,"filter-currency":_vm.filtercurrency,"filterthousand-bit":_vm.filterthousandBit}},[_vm._t("prefix",null,{"slot":"prefix"}),_vm._t("suffix",null,{"slot":"suffix"}),_vm._t("prepend",null,{"slot":"prepend"}),_vm._t("append",null,{"slot":"append"})],2):_vm._e()],2):_vm._e()}
-var mainvue_type_template_id_fdca2abe_scoped_true_staticRenderFns = []
+    _vm.company ? 'has-company-box' : '' ]},[(_vm.isShowInput)?_c('el-input',{directives:[{name:"validate",rawName:"v-validate",value:(_vm.inputValidate),expression:"inputValidate"}],ref:"inputEle",class:{ readonly_input: _vm.readonly },style:(_vm.inputWidth),attrs:{"type":_vm.type,"size":_vm.inputSize,"name":_vm.inputName,"placeholder":_vm.readonly ? '' : _vm.placeholder,"clearable":_vm.clearable,"show-password":_vm.showPassword,"disabled":_vm.isDisabled,"readonly":_vm.readonly,"rows":_vm.rowsVal,"cols":_vm.colsVal,"min":_vm.min,"max":_vm.max,"autosize":_vm.autosize,"resize":_vm.resize,"tabindex":_vm.tabindex,"prefix-icon":_vm.prefixIcon,"suffix-icon":_vm.suffixIcon,"minlength":_vm.minlength,"maxlength":_vm.maxlength,"show-word-limit":_vm.showWordLimit},on:{"blur":_vm.handleBlur,"focus":_vm.handleFocus,"change":_vm.handleChange,"input":_vm.handleInput,"clear":_vm.handleClear},model:{value:(_vm.inputVal),callback:function ($$v) {_vm.inputVal=$$v},expression:"inputVal"}},[_vm._t("prefix",null,{"slot":"prefix"}),_vm._t("suffix",null,{"slot":"suffix"}),_vm._t("prepend",null,{"slot":"prepend"}),_vm._t("append",null,{"slot":"append"})],2):_vm._e(),(_vm.inputWriteable && _vm.type == 'number')?[_c('el-input-number',{directives:[{name:"show",rawName:"v-show",value:(_vm.isNumber),expression:"isNumber"},{name:"validate",rawName:"v-validate",value:(_vm.inputValidate),expression:"inputValidate"}],ref:"inputEle",style:(_vm.inputWidth),attrs:{"type":_vm.type,"controls-position":_vm.controlsPosition,"size":_vm.inputSize,"name":_vm.inputName,"placeholder":_vm.placeholder,"clearable":_vm.clearable,"disabled":_vm.disabled,"readonly":_vm.readonly,"min":_vm.min,"max":_vm.max,"step":_vm.step,"step-strictly":_vm.stepStrictly,"precision":_vm.precision},on:{"blur":_vm.handleNumberBlur,"focus":_vm.handleFocus,"change":_vm.handleChange},model:{value:(_vm.inputVal),callback:function ($$v) {_vm.inputVal=$$v},expression:"inputVal"}}),_c('el-input',{directives:[{name:"show",rawName:"v-show",value:(!_vm.isNumber),expression:"!isNumber"}],ref:"exhibit",staticClass:"exhibit",style:(_vm.inputWidth),attrs:{"type":"text","controls-position":_vm.controlsPosition,"size":_vm.inputSize,"name":_vm.inputName,"placeholder":_vm.placeholder,"disabled":_vm.disabled,"readonly":_vm.readonly,"min":_vm.min,"max":_vm.max,"step":_vm.step,"step-strictly":_vm.stepStrictly,"precision":_vm.precision},on:{"focus":_vm.exhibitFocus},model:{value:(_vm.exhibitText),callback:function ($$v) {_vm.exhibitText=$$v},expression:"exhibitText"}}),(_vm.company)?_c('span',[_vm._v(_vm._s(_vm.company))]):_vm._e()]:_vm._e(),(_vm.isShowText)?_c('ht-field-tail',{attrs:{"field-name":_vm.inputName,"readonly":!_vm.inputWriteable,"input-value":_vm.readOnlyInputVal,"company":_vm.company,"precision":_vm.precision,"type":_vm.type,"filter-currency":_vm.filtercurrency,"filterthousand-bit":_vm.filterthousandBit}},[_vm._t("prefix",null,{"slot":"prefix"}),_vm._t("suffix",null,{"slot":"suffix"}),_vm._t("prepend",null,{"slot":"prepend"}),_vm._t("append",null,{"slot":"append"})],2):_vm._e()],2):_vm._e()}
+var mainvue_type_template_id_34c688c8_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/Input/src/main.vue?vue&type=template&id=fdca2abe&scoped=true&
+// CONCATENATED MODULE: ./packages/Input/src/main.vue?vue&type=template&id=34c688c8&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ad7f362a-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/FieldTail/src/main.vue?vue&type=template&id=4b08423d&scoped=true&
 var mainvue_type_template_id_4b08423d_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('span',{staticClass:"field-tail__wrap"},[(_vm.hasErrors)?_c('small',{staticClass:"el-form-item__error"},[_vm._v("\n    "+_vm._s(_vm.errorMessage)+"\n  ")]):_vm._e(),(_vm.readonly && _vm.tagFormatValue.length == 0)?_c('div',{staticClass:"field-tail"},[(_vm.isReadonlyTextarea)?_c('div',_vm._l((_vm.formatInputValue),function(item,index){return _c('div',{key:index},[(item)?_c('p',{staticClass:"readonly_p"},[_vm._t("prefix"),_vm._t("suffix"),_vm._t("prepend"),_vm._v("\n          "+_vm._s(item)+"\n          "),_vm._t("append")],2):_c('br')])}),0):(_vm.$readonlyInput)?_c('el-input',{attrs:{"disabled":""},model:{value:(_vm.inputValue),callback:function ($$v) {_vm.inputValue=$$v},expression:"inputValue"}}):_c('span',[_vm._t("prefix"),_vm._t("suffix"),_vm._t("prepend"),_vm._v("\n      "+_vm._s(_vm.currentShowValue)+"\n      "),(_vm.company && !_vm.filterCurrency)?[_vm._v(_vm._s(_vm.company))]:_vm._e(),_vm._t("append")],2)],1):_vm._e(),(
@@ -9201,6 +9201,7 @@ var external_lodash_default = /*#__PURE__*/__webpack_require__.n(external_lodash
 //
 //
 //
+//
 
 
 
@@ -9675,8 +9676,8 @@ var external_lodash_default = /*#__PURE__*/__webpack_require__.n(external_lodash
 });
 // CONCATENATED MODULE: ./packages/Input/src/main.vue?vue&type=script&lang=js&
  /* harmony default export */ var packages_Input_src_mainvue_type_script_lang_js_ = (Input_src_mainvue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/Input/src/main.vue?vue&type=style&index=0&id=fdca2abe&prod&lang=scss&scoped=true&
-var mainvue_type_style_index_0_id_fdca2abe_prod_lang_scss_scoped_true_ = __webpack_require__("f2f4");
+// EXTERNAL MODULE: ./packages/Input/src/main.vue?vue&type=style&index=0&id=34c688c8&prod&lang=scss&scoped=true&
+var mainvue_type_style_index_0_id_34c688c8_prod_lang_scss_scoped_true_ = __webpack_require__("79d0");
 
 // CONCATENATED MODULE: ./packages/Input/src/main.vue
 
@@ -9689,11 +9690,11 @@ var mainvue_type_style_index_0_id_fdca2abe_prod_lang_scss_scoped_true_ = __webpa
 
 var src_main_component = normalizeComponent(
   packages_Input_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_fdca2abe_scoped_true_render,
-  mainvue_type_template_id_fdca2abe_scoped_true_staticRenderFns,
+  mainvue_type_template_id_34c688c8_scoped_true_render,
+  mainvue_type_template_id_34c688c8_scoped_true_staticRenderFns,
   false,
   null,
-  "fdca2abe",
+  "34c688c8",
   null
   
 )
@@ -10402,12 +10403,12 @@ Checkbox_src_main.install = function (Vue) {
   Vue.component(Checkbox_src_main.name, Checkbox_src_main);
 };
 /* harmony default export */ var Checkbox = (Checkbox_src_main);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ad7f362a-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/Table/src/Table.vue?vue&type=template&id=547c4c80&scoped=true&
-var Tablevue_type_template_id_547c4c80_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-main',{ref:"tablePanel",staticClass:"ht-table-panel"},[(!_vm.noHeader && !_vm.justShowSearch)?_c('div',{ref:"toolbarPanel",staticClass:"toolbar-panel"},[(!_vm.justShowSearch)?_c('div',{staticClass:"toolbar-panel__search",class:{ 'ht-quick__search': !_vm.hideTableSearch }},[(_vm.quickSearchConfig && _vm.quickSearchConfig.length > 0)?_c('ht-input',{ref:"quickSearch",staticClass:"quick-search",staticStyle:{"margin-right":"20px"},style:(_vm.quickSearchWidthStyle),attrs:{"placeholder":_vm.quickSearchPlaceholder,"autofocus":true,"disabled":_vm.loading || _vm.showAdvancedSearch,"debounce":2000,"suffix-icon":"el-icon-search"},nativeOn:{"keydown":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.doQuickSearch($event)},"click":function($event){return _vm.clickQuickSearch($event)}},model:{value:(_vm.quickSearchWord),callback:function ($$v) {_vm.quickSearchWord=$$v},expression:"quickSearchWord"}}):_vm._e(),_c('div',{staticClass:"common-tools"},[(_vm.hasSearchPanel && !_vm.justShowSearch)?_c('el-button',{staticClass:"advance-search__button",on:{"click":function($event){_vm.showAdvancedSearch = !_vm.showAdvancedSearch}}},[_vm._v("\n          "+_vm._s(_vm.showAdvancedSearch ? '基础搜索' : '高级搜索')+"\n          "),_c('i',{class:_vm.showAdvancedSearch ? 'el-icon-arrow-up' : 'el-icon-arrow-down'})]):_vm._e(),(_vm.showExport)?_c('el-tooltip',{attrs:{"content":"导出数据","placement":"top"}},[_c('el-button',{on:{"click":function($event){return _vm.$emit('export')}}},[_c('ht-icon',{attrs:{"name":"arrow"}})],1)],1):_vm._e(),_c('el-tooltip',{attrs:{"content":"刷新数据","placement":"top"}},[_c('el-button',{staticClass:"refresh-btn-icon",attrs:{"icon":"el-icon-refresh"},on:{"click":function($event){return _vm.load(true)}}})],1),(_vm.showCustomColumn && !_vm.isCardView)?_c('el-tooltip',{attrs:{"content":"自定义列","placement":"top"}},[_c('el-button',{on:{"click":function($event){_vm.customColumnDialogVisible = true}}},[_c('ht-icon',{attrs:{"name":"setting"}})],1)],1):_vm._e(),(_vm.multiViewSwitch)?_c('el-button-group',{staticClass:"multiview-switcher"},[_c('el-tooltip',{attrs:{"content":"卡片视图","placement":"top"}},[_c('el-button',{attrs:{"type":_vm.isCardView ? 'primary' : 'default'},on:{"click":function($event){_vm.isCardView = true}}},[_c('ht-icon',{attrs:{"name":"block"}})],1)],1),_c('el-tooltip',{attrs:{"content":"表格视图","placement":"top"}},[_c('el-button',{attrs:{"type":_vm.isCardView ? 'default' : 'primary'},on:{"click":function($event){_vm.isCardView = false}}},[_c('ht-icon',{attrs:{"name":"line"}})],1)],1)],1):_vm._e()],1)],1):_vm._e()]):_vm._e(),_c('el-collapse-transition',[_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.showAdvancedSearch || _vm.justShowSearch),expression:"showAdvancedSearch || justShowSearch"}],ref:"searchPanel",staticClass:"search-panel"},[_vm._t("search")],2)]),(_vm.hasToolBar)?_c('div',{ref:"toolbarContainer",staticClass:"toolbar-container"},[_vm._t("toolbar")],2):_vm._e(),(!_vm.isCardView)?_c('el-table',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading && !_vm.noLoading),expression:"loading && !noLoading"}],ref:"htTable",staticClass:"ht-table",class:{ 'no-data-table': _vm.data.length < 1 },style:({ height: "" + (_vm.tableMaxHeight ? _vm.tableMaxHeight : 400) + 'px' }),attrs:{"stripe":_vm.stripe,"border":"","data":_vm.data,"size":_vm.size,"empty-text":_vm.emptyText,"show-header":_vm.showHeader,"max-height":_vm.tableMaxHeight ? _vm.tableMaxHeight : 400,"tooltip-effect":_vm.tooltipEffect,"default-querys":_vm.defaultQuerys,"header-row-class-name":_vm.headerRowClassName,"header-cell-class-name":_vm.headerCellClassName,"highlight-current-row":_vm.highlightCurrentRow,"row-class-name":_vm.rowClassName,"cell-class-name":_vm.cellClassName,"row-key":_vm.rowKey},on:{"row-click":_vm.handleRowClick,"select":_vm.handleTableSelect,"select-all":_vm.handleTableSelect,"sort-change":_vm.handleSortChange,"filter-change":_vm.handleFilterChange,"selection-change":function (selection) { return _vm.$emit('selection-change', selection); }}},[(_vm.selectable)?_c('el-table-column',{attrs:{"type":"selection","align":"center","reserve-selection":_vm.reserveSelection,"width":"45"}}):_vm._e(),_vm._t("default"),_c('template',{slot:"empty"},[_c('el-image',{attrs:{"src":_vm.tableNoDataImg}}),_c('p',{staticClass:"no-data-text"},[_vm._v(_vm._s(_vm.emptyText || _vm.t('el.table.emptyText')))])],1)],2):_c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading && !_vm.noLoading),expression:"loading && !noLoading"}],staticClass:"ht-card",style:({ height: "" + _vm.tableMaxHeight + 'px' })},[(_vm.loading || (_vm.data && _vm.data.length > 0))?[(_vm.cardItemMode)?_c('div',{staticClass:"ht-card__container"},_vm._l((_vm.data),function(item,index){return _c('el-card',{key:index,attrs:{"shadow":"hover"},nativeOn:{"click":function($event){return _vm.$emit('card-click', item)}}},[_vm._t("card",null,{"item":item})],2)}),1):_c('div',[_vm._t("card",null,{"data":_vm.data})],2)]:_c('div',{staticClass:"el-table__empty-block"},[(_vm.data.length < 1 && !_vm.emptyText)?[_vm._t("empty-card")]:(_vm.emptyText)?_c('span',{staticClass:"el-table__empty-text"},[_vm._v("\n        "+_vm._s(_vm.emptyText || _vm.t('el.table.emptyText'))+"\n      ")]):_vm._e()],2)],2),(!_vm.nopagination)?_c('div',{ref:"paginationPanel",staticClass:"pagination-panel"},[_c('el-row',{attrs:{"type":"flex","justify":_vm.tablePaginationJustify}},[_c('el-pagination',{class:{ 'page-sizes__hidden': _vm.hidePageSizes },attrs:{"small":_vm.small,"disabled":_vm.loading,"current-page":_vm.pagination.page,"page-sizes":_vm.pageSizes,"page-size":_vm.pagination.pageSize,"pager-count":_vm.pagerCount,"background":_vm.$paginationBackground,"layout":_vm.layout,"total":_vm.pagination.total},on:{"size-change":_vm.handleSizeChange,"current-change":_vm.handleCurrentChange}})],1)],1):_vm._e(),_c('custom-column',{attrs:{"custom-columns":_vm.customColumns,"visible":_vm.customColumnDialogVisible},on:{"update:visible":function($event){_vm.customColumnDialogVisible=$event},"apply-custom-column":_vm.handleApplyCustomColumn}})],1)}
-var Tablevue_type_template_id_547c4c80_scoped_true_staticRenderFns = []
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ad7f362a-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/Table/src/Table.vue?vue&type=template&id=9aefb486&scoped=true&
+var Tablevue_type_template_id_9aefb486_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('el-main',{ref:"tablePanel",staticClass:"ht-table-panel"},[(!_vm.noHeader && !_vm.justShowSearch)?_c('div',{ref:"toolbarPanel",staticClass:"toolbar-panel"},[(!_vm.justShowSearch)?_c('div',{staticClass:"toolbar-panel__search",class:{ 'ht-quick__search': !_vm.hideTableSearch }},[(_vm.quickSearchConfig && _vm.quickSearchConfig.length > 0)?_c('ht-input',{ref:"quickSearch",staticClass:"quick-search",staticStyle:{"margin-right":"20px"},style:(_vm.quickSearchWidthStyle),attrs:{"placeholder":_vm.quickSearchPlaceholder,"autofocus":true,"disabled":_vm.loading || _vm.showAdvancedSearch,"debounce":2000,"suffix-icon":"el-icon-search"},nativeOn:{"keydown":function($event){if(!$event.type.indexOf('key')&&_vm._k($event.keyCode,"enter",13,$event.key,"Enter")){ return null; }return _vm.doQuickSearch($event)},"click":function($event){return _vm.clickQuickSearch($event)}},model:{value:(_vm.quickSearchWord),callback:function ($$v) {_vm.quickSearchWord=$$v},expression:"quickSearchWord"}}):_vm._e(),_c('div',{staticClass:"common-tools"},[(_vm.hasSearchPanel && !_vm.justShowSearch)?_c('el-button',{staticClass:"advance-search__button",on:{"click":function($event){_vm.showAdvancedSearch = !_vm.showAdvancedSearch}}},[_vm._v("\n          "+_vm._s(_vm.showAdvancedSearch ? '基础搜索' : '高级搜索')+"\n          "),_c('i',{class:_vm.showAdvancedSearch ? 'el-icon-arrow-up' : 'el-icon-arrow-down'})]):_vm._e(),(_vm.showExport)?_c('el-tooltip',{attrs:{"content":"导出数据","placement":"top"}},[_c('el-button',{on:{"click":function($event){return _vm.$emit('export')}}},[_c('ht-icon',{attrs:{"name":"arrow"}})],1)],1):_vm._e(),_c('el-tooltip',{attrs:{"content":"刷新数据","placement":"top"}},[_c('el-button',{staticClass:"refresh-btn-icon",attrs:{"icon":"el-icon-refresh"},on:{"click":function($event){return _vm.load(true)}}})],1),(_vm.showCustomColumn && !_vm.isCardView)?_c('el-tooltip',{attrs:{"content":"自定义列","placement":"top"}},[_c('el-button',{on:{"click":function($event){_vm.customColumnDialogVisible = true}}},[_c('ht-icon',{attrs:{"name":"setting"}})],1)],1):_vm._e(),(_vm.multiViewSwitch)?_c('el-button-group',{staticClass:"multiview-switcher"},[_c('el-tooltip',{attrs:{"content":"卡片视图","placement":"top"}},[_c('el-button',{attrs:{"type":_vm.isCardView ? 'primary' : 'default'},on:{"click":function($event){_vm.isCardView = true}}},[_c('ht-icon',{attrs:{"name":"block"}})],1)],1),_c('el-tooltip',{attrs:{"content":"表格视图","placement":"top"}},[_c('el-button',{attrs:{"type":_vm.isCardView ? 'default' : 'primary'},on:{"click":function($event){_vm.isCardView = false}}},[_c('ht-icon',{attrs:{"name":"line"}})],1)],1)],1):_vm._e()],1)],1):_vm._e()]):_vm._e(),_c('el-collapse-transition',[_c('div',{directives:[{name:"show",rawName:"v-show",value:(_vm.showAdvancedSearch || _vm.justShowSearch),expression:"showAdvancedSearch || justShowSearch"}],ref:"searchPanel",staticClass:"search-panel"},[_vm._t("search")],2)]),(_vm.hasToolBar)?_c('div',{ref:"toolbarContainer",staticClass:"toolbar-container"},[_vm._t("toolbar")],2):_vm._e(),(!_vm.isCardView)?_c('el-table',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading && !_vm.noLoading),expression:"loading && !noLoading"}],ref:"htTable",staticClass:"ht-table",class:{ 'no-data-table': _vm.data.length < 1 },style:({ height: "" + (_vm.tableMaxHeight ? _vm.tableMaxHeight : 400) + 'px' }),attrs:{"stripe":_vm.stripe,"border":"","data":_vm.data,"size":_vm.size,"empty-text":_vm.emptyText,"show-header":_vm.showHeader,"max-height":_vm.tableMaxHeight ? _vm.tableMaxHeight : 400,"tooltip-effect":_vm.tooltipEffect,"default-querys":_vm.defaultQuerys,"header-row-class-name":_vm.headerRowClassName,"header-cell-class-name":_vm.headerCellClassName,"highlight-current-row":_vm.highlightCurrentRow,"row-class-name":_vm.rowClassName,"cell-class-name":_vm.cellClassName,"row-key":_vm.rowKey},on:{"row-click":_vm.handleRowClick,"select":_vm.handleTableSelect,"select-all":_vm.handleTableSelect,"sort-change":_vm.handleSortChange,"filter-change":_vm.handleFilterChange,"selection-change":function (selection) { return _vm.$emit('selection-change', selection); }}},[(_vm.selectable)?_c('el-table-column',{attrs:{"type":"selection","align":"center","reserve-selection":_vm.reserveSelection,"width":"45"}}):_vm._e(),_vm._t("default"),_c('template',{slot:"empty"},[_c('el-image',{attrs:{"src":_vm.tableNoDataImg}}),_c('p',{staticClass:"no-data-text"},[_vm._v(_vm._s(_vm.emptyText || _vm.t('el.table.emptyText')))])],1)],2):_c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.loading && !_vm.noLoading),expression:"loading && !noLoading"}],staticClass:"ht-card",style:({ height: "" + _vm.tableMaxHeight + 'px' })},[(_vm.loading || (_vm.data && _vm.data.length > 0))?[(_vm.cardItemMode)?_c('div',{staticClass:"ht-card__container"},_vm._l((_vm.data),function(item,index){return _c('el-card',{key:index,attrs:{"shadow":"hover"},nativeOn:{"click":function($event){return _vm.$emit('card-click', item)}}},[_vm._t("card",null,{"item":item})],2)}),1):_c('div',[_vm._t("card",null,{"data":_vm.data})],2)]:_c('div',{staticClass:"el-table__empty-block"},[(_vm.data.length < 1 && !_vm.emptyText)?[_vm._t("empty-card")]:(_vm.emptyText)?_c('span',{staticClass:"el-table__empty-text"},[_vm._v("\n        "+_vm._s(_vm.emptyText || _vm.t('el.table.emptyText'))+"\n      ")]):_vm._e()],2)],2),(!_vm.nopagination)?_c('div',{ref:"paginationPanel",staticClass:"pagination-panel"},[_c('el-row',{attrs:{"type":"flex","justify":_vm.tablePaginationJustify}},[_c('el-pagination',{class:{ 'page-sizes__hidden': _vm.hidePageSizes },attrs:{"small":_vm.small,"disabled":_vm.loading,"current-page":_vm.pagination.page,"page-sizes":_vm.pageSizes,"page-size":_vm.pagination.pageSize,"pager-count":_vm.pagerCount,"background":_vm.$paginationBackground,"layout":_vm.layout,"total":_vm.pagination.total},on:{"size-change":_vm.handleSizeChange,"current-change":_vm.handleCurrentChange}})],1)],1):_vm._e(),_c('custom-column',{attrs:{"custom-columns":_vm.customColumns,"visible":_vm.customColumnDialogVisible},on:{"update:visible":function($event){_vm.customColumnDialogVisible=$event},"apply-custom-column":_vm.handleApplyCustomColumn}})],1)}
+var Tablevue_type_template_id_9aefb486_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./packages/Table/src/Table.vue?vue&type=template&id=547c4c80&scoped=true&
+// CONCATENATED MODULE: ./packages/Table/src/Table.vue?vue&type=template&id=9aefb486&scoped=true&
 
 // EXTERNAL MODULE: ./src/locale/index.js + 2 modules
 var locale = __webpack_require__("fe07");
@@ -11524,6 +11525,14 @@ var external_element_resize_detector_default = /*#__PURE__*/__webpack_require__.
       this.$emit('sort-change', column);
     },
     handleFilterChange(m) {
+      // 如果是点击的是重置 筛选条件 需把默认的筛选条件里数据也删除掉
+      if (m) {
+        Object.keys(m).forEach(key => {
+          if (m[key] && m[key].length == 0 && this.resetDefaultFilter.indexOf(key) === -1) {
+            this.resetDefaultFilter.push(key);
+          }
+        });
+      }
       this.filters = {
         ...this.filters,
         ...m
@@ -11533,8 +11542,8 @@ var external_element_resize_detector_default = /*#__PURE__*/__webpack_require__.
           delete this.filters[k];
         }
       });
-      this.load();
       this.$emit('filter-change', m);
+      this.load();
     },
     doLayout() {
       this.$nextTick(() => {
@@ -11583,8 +11592,8 @@ var external_element_resize_detector_default = /*#__PURE__*/__webpack_require__.
 });
 // CONCATENATED MODULE: ./packages/Table/src/Table.vue?vue&type=script&lang=js&
  /* harmony default export */ var src_Tablevue_type_script_lang_js_ = (Tablevue_type_script_lang_js_); 
-// EXTERNAL MODULE: ./packages/Table/src/Table.vue?vue&type=style&index=0&id=547c4c80&prod&lang=scss&scoped=true&
-var Tablevue_type_style_index_0_id_547c4c80_prod_lang_scss_scoped_true_ = __webpack_require__("7152");
+// EXTERNAL MODULE: ./packages/Table/src/Table.vue?vue&type=style&index=0&id=9aefb486&prod&lang=scss&scoped=true&
+var Tablevue_type_style_index_0_id_9aefb486_prod_lang_scss_scoped_true_ = __webpack_require__("f556");
 
 // CONCATENATED MODULE: ./packages/Table/src/Table.vue
 
@@ -11597,11 +11606,11 @@ var Tablevue_type_style_index_0_id_547c4c80_prod_lang_scss_scoped_true_ = __webp
 
 var Table_component = normalizeComponent(
   src_Tablevue_type_script_lang_js_,
-  Tablevue_type_template_id_547c4c80_scoped_true_render,
-  Tablevue_type_template_id_547c4c80_scoped_true_staticRenderFns,
+  Tablevue_type_template_id_9aefb486_scoped_true_render,
+  Tablevue_type_template_id_9aefb486_scoped_true_staticRenderFns,
   false,
   null,
-  "547c4c80",
+  "9aefb486",
   null
   
 )
@@ -45587,7 +45596,7 @@ const req = function (url) {
     //获取汇总全部数据
     getAllSummary(data) {
       const allSummaryConfig = data.reduce((pre, cur) => {
-        pre[cur.field] = cur.val;
+        pre[cur.field] = utils["a" /* default */].thousandBit(cur.val);
         return pre;
       }, {});
       if (Object.keys(allSummaryConfig).length) {
@@ -45778,9 +45787,14 @@ const req = function (url) {
         let manageField = JSON.parse(this.templateInfo.manageField);
         let this_ = this;
         manageField.forEach(item => {
+          if (item.buttonId) {
+            obj[item.buttonId] = true;
+          }
           if (item.beforeScriptValue) {
             let promise = this_.beforeScript(item.beforeScriptValue, item);
             promise.then(res => {
+              obj[item.buttonId] = res;
+              //为兼容旧数据（没有buttonId的数据）
               obj[item.name] = res;
             });
           }
@@ -46285,6 +46299,10 @@ const req = function (url) {
     },
     //列表数据查询入口
     search(param, cb, isSearchBtn) {
+      // 如果是高级查询，页码重置为首页
+      if (isSearchBtn) {
+        this.pagination.page = 1;
+      }
       let params = {};
       //判断为合并查询还是高级查询
       let showAdvancedSearch = this.$refs.multipleTemplateTable ? this.$refs.multipleTemplateTable.showAdvancedSearch : false;
@@ -46353,7 +46371,7 @@ const req = function (url) {
         let tempQueryS = [];
         let betweenConditions = {};
         params.pagination.querys.forEach(q => {
-          if (q.value && (q.operation != 'BETWEEN' || q.value.constructor == Array)) {
+          if (q.value != undefined && (q.operation != 'BETWEEN' || q.value.constructor == Array)) {
             tempQueryS.push(q);
           } else if (q.value) {
             let conditions = q;
@@ -46752,10 +46770,11 @@ const req = function (url) {
         const filterField = utils["a" /* default */].parseToJson(this.templateInfo.filteringField);
         temquerys.forEach(q => {
           let prefix = this.getColPreFix(conditionField, q.property);
+          const queryPre = this.getQueryPre(conditionField, q.property);
           if (!prefix) {
             prefix = this.getColPreFix(filterField, q.property);
           }
-          q.property = prefix + q.property;
+          q.property = queryPre + prefix + q.property;
           querys.push(q);
         });
       }
@@ -47167,6 +47186,24 @@ const req = function (url) {
         });
         this.curSelectParams.fieldExport = fieldExport;
       }
+      if (type === 'selected') {
+        const selectedId = this.tableData.selectRows.map(item => item.id_);
+        const selectedQuery = {
+          property: 't.id_',
+          value: selectedId ? selectedId.join(',') : '',
+          group: 'main',
+          operation: 'IN',
+          relation: 'AND'
+        };
+        this.curSelectParams.queryFilter.querys = [...this.curSelectParams.queryFilter.querys, selectedQuery];
+      }
+      //导出全部数据按钮
+      if (type == 'all') {
+        this.curSelectParams.queryFilter.querys = [];
+      }
+      let loadingInstance = external_element_ui_["Loading"].service({
+        fullscreen: true
+      }); //开始
       this.$requestConfig.exportByBtnSetting({
         id: this.templateInfo.id,
         params: this.curSelectParams
@@ -47178,6 +47215,12 @@ const req = function (url) {
         const fileName = decodeURIComponent(headers['content-disposition'].split(';')[1].split('filename=')[1]);
         const blob = new Blob([data]);
         templatePreview_saveAs(blob, fileName);
+        loadingInstance.close(); // 结束
+      }, e => {
+        loadingInstance.close(); // 结束
+        let enc = new TextDecoder('utf-8');
+        let uint8_msg = JSON.parse(enc.decode(new Uint8Array(e.response.data)));
+        this.$message.error(uint8_msg.message);
       });
     },
     importCommand(params) {
@@ -47443,6 +47486,12 @@ const req = function (url) {
           group: 'main',
           operation: 'EQUAL',
           relation: 'AND'
+        }, {
+          property: 'bo_alias_',
+          value: this.templateInfo.boDefAlias,
+          group: 'main',
+          operation: 'EQUAL',
+          relation: 'AND'
         }]
       };
       this.recordTableLoading = true;
@@ -47798,6 +47847,10 @@ const req = function (url) {
       this.getBpmTemplateByPagination(params);
     },
     filterChange(filters) {
+      // 筛选时需重置页面页码
+      if (filters) {
+        this.pagination.page = 1;
+      }
       if (filters && Object.keys(filters).length > 0) {
         const key = Object.keys(filters)[0];
         const filter = filters[key];
@@ -48118,7 +48171,10 @@ const req = function (url) {
       let fields = field.toLowerCase();
       const currentRows = currentData ? currentData : this.rows;
       let list = currentRows && currentRows.filter(item => item[fields] !== undefined && item[fields] !== '').map(item => Number(item[fields]));
-      if (!list || list.length == 0) return;
+      if (!list || list.length == 0) {
+        let num = 0;
+        return num.toFixed(decimal);
+      }
       const METHOD_MAP = {
         count: 'getCount',
         sum: 'getSum',
@@ -48279,7 +48335,7 @@ const req = function (url) {
                 type: dialogConfig.custDialog
               };
               obj.custdialog = {
-                name: '请选择',
+                name: dialogConfig.name || '请选择',
                 custDialog: custdialog,
                 resultField: dialogConfig.resultField
               };
@@ -48347,6 +48403,10 @@ const req = function (url) {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
+        let loadingInstance = external_element_ui_["Loading"].service({
+          fullscreen: true,
+          text: '数据更新中...'
+        });
         let selectRows = row ? [row] : this.tableData.selectRows ? this.tableData.selectRows : row;
         for (let i = 0; i < selectRows.length; i++) {
           selectRows[i].formKey = this.templateInfo.formKey;
@@ -48364,14 +48424,28 @@ const req = function (url) {
               type: 'success',
               message: data.message
             });
+            this.$nextTick(() => {
+              // 以服务的方式调用的 Loading 需要异步关闭
+              loadingInstance.close();
+            });
             this.search({
               querys: this.buildDefaultQuerys() || []
             });
             // 更新成功后需执行后置js
-            let script = templatePreview_Base64.decode(afterScriptValue);
-            this.tempScript(script, row);
+            if (afterScriptValue) {
+              let script = templatePreview_Base64.decode(afterScriptValue);
+              this.tempScript(script, row);
+            }
+          } else {
+            this.$nextTick(() => {
+              // 以服务的方式调用的 Loading 需要异步关闭
+              loadingInstance.close();
+            });
           }
+        }).finally(() => {
+          loadingInstance.close();
         });
+        this.$parent.init();
       }).catch(() => {
         this.$message({
           type: 'info',
@@ -48548,7 +48622,8 @@ const req = function (url) {
         }
       } else if (btnOk.indexOf(btnAlias) != -1) {
         if (btnAlias == 'switch') {
-          this.switchChange(parameter.pkField, parameter.switchOn, parameter.switchOff, parameter.bind, parameter.row, parameter.switchDefaultTrue, afterScriptValue);
+          const pkFieldValue = parameter.pkField || this.getBindValue(row, this.templateInfo.pkField);
+          this.switchChange(pkFieldValue, parameter.switchOn, parameter.switchOff, parameter.bind, parameter.row, parameter.switchDefaultTrue, afterScriptValue);
         } else if (btnAlias == 'batchUpdate') {
           //如果是行间按钮，就不用判断是否选择了数据
           if (parameter.position) {