@weitutech/by-components 1.1.57 → 1.1.59

package/lib/by-components.common.js

@@ -62325,8 +62325,8 @@ var table_component = normalizeComponent(
 )
 
 /* harmony default export */ var table = (table_component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/form.vue?vue&type=template&id=39a065ba&scoped=true
-var formvue_type_template_id_39a065ba_scoped_true_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/form.vue?vue&type=template&id=1068122a&scoped=true
+var formvue_type_template_id_1068122a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -62444,6 +62444,7 @@ var formvue_type_template_id_39a065ba_scoped_true_render = function render() {
         "type": item.selectorType || 'select',
         "options": item.options || [],
         "loadOptions": item.loadOptions,
+        "hiddenAllOptions": item.hiddenAllOptions,
         "multiple": item.multiple,
         "placeholder": item.placeholder,
         "size": _vm.elSize
@@ -62453,7 +62454,44 @@ var formvue_type_template_id_39a065ba_scoped_true_render = function render() {
           return _vm.handleValueChange($event, item);
         }
       }
-    }, 'by-common-selector', item.otherOptions || {}, false))] : item.type === 'datepicker' ? [_c('el-date-picker', _vm._b({
+    }, 'by-common-selector', item.otherOptions || {}, false))] : item.type === 'commonSelectorInput' ? [_c('div', {
+      staticClass: "common-selector-input-container"
+    }, [_c('by-common-selector', _vm._b({
+      staticStyle: {
+        "width": "60%"
+      },
+      attrs: {
+        "value": _vm.value[`${item.selectorField}`],
+        "config": item,
+        "type": item.selectorType || 'select',
+        "options": item.options || [],
+        "loadOptions": item.loadOptions,
+        "hiddenAllOptions": item.hiddenAllOptions,
+        "multiple": item.multiple,
+        "placeholder": item.selectorPlaceholder || '请选择',
+        "size": _vm.elSize
+      },
+      on: {
+        "input": function ($event) {
+          return _vm.handleSelectorInputChange($event, item, 'selector');
+        }
+      }
+    }, 'by-common-selector', item.selectorOptions || {}, false)), _c('el-input', _vm._b({
+      staticStyle: {
+        "width": "180px"
+      },
+      attrs: {
+        "value": _vm.value[`${item.inputField}`],
+        "placeholder": item.inputPlaceholder || '请输入',
+        "clearable": "",
+        "size": _vm.elSize
+      },
+      on: {
+        "input": function ($event) {
+          return _vm.handleSelectorInputChange($event, item, 'input');
+        }
+      }
+    }, 'el-input', item.inputOptions || {}, false))], 1)] : item.type === 'datepicker' ? [_c('el-date-picker', _vm._b({
       staticStyle: {
         "width": "100%"
       },
@@ -62619,7 +62657,7 @@ var formvue_type_template_id_39a065ba_scoped_true_render = function render() {
     staticClass: "footer"
   }, [_vm._t("footer")], 2)], 1);
 };
-var formvue_type_template_id_39a065ba_scoped_true_staticRenderFns = [];
+var formvue_type_template_id_1068122a_scoped_true_staticRenderFns = [];
 
 ;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/comps/pair-number-input.vue?vue&type=template&id=604235f6
 var pair_number_inputvue_type_template_id_604235f6_render = function render() {
@@ -62919,8 +62957,8 @@ var custom_date_picker_component = normalizeComponent(
 )
 
 /* harmony default export */ var custom_date_picker = (custom_date_picker_component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common-selector/ByCommonSelector.vue?vue&type=template&id=4a7ce486
-var ByCommonSelectorvue_type_template_id_4a7ce486_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common-selector/ByCommonSelector.vue?vue&type=template&id=042a5da2
+var ByCommonSelectorvue_type_template_id_042a5da2_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -62954,7 +62992,7 @@ var ByCommonSelectorvue_type_template_id_4a7ce486_render = function render() {
         "disabled": item.status === 0
       }
     });
-  }), 1) : [_c('el-checkbox', {
+  }), 1) : [!_vm.hiddenAllOptions ? _c('el-checkbox', {
     class: ['by_selected_all', {
       'by_border-transparent': _vm.type !== 'border'
     }],
@@ -62975,7 +63013,7 @@ var ByCommonSelectorvue_type_template_id_4a7ce486_render = function render() {
     }
   }, [_c('span', {
     staticClass: "by_checkbox-label"
-  }, [_vm._v("全部")])]), _c('div', {
+  }, [_vm._v("全部")])]) : _vm._e(), _c('div', {
     staticClass: "by_consult-select-container",
     class: {
       by_shrink: !_vm.open
@@ -63137,7 +63175,7 @@ var ByCommonSelectorvue_type_template_id_4a7ce486_render = function render() {
     }
   }, [_vm._v(" 加载中... ")]) : _vm._e()], 2);
 };
-var ByCommonSelectorvue_type_template_id_4a7ce486_staticRenderFns = [];
+var ByCommonSelectorvue_type_template_id_042a5da2_staticRenderFns = [];
 
 ;// ./node_modules/pinyin-pro/dist/index.mjs
 
@@ -73453,6 +73491,13 @@ function segment(word, options) {
       type: Function,
       default: null
     },
+    /**
+     * 是否隐藏全部选项
+     */
+    hiddenAllOptions: {
+      type: Boolean,
+      default: false
+    },
     /**
      * 是否多选
      */
@@ -73554,10 +73599,28 @@ function segment(word, options) {
       this.scheduleExpandCheck();
     },
     options: {
-      handler() {
+      handler(newOptions, oldOptions) {
         if (!this.loadOptions) {
           this.localOptions = [...this.options];
+
+          // 判断数据总量是否变化
+          const oldLength = oldOptions ? oldOptions.length : 0;
+          const newLength = newOptions ? newOptions.length : 0;
+
+          // 保存当前页码
+          const currentPage = this.currentPage;
           this.initData();
+
+          // 如果数据总量变化，重置到第一页
+          if (oldLength !== newLength) {
+            this.currentPage = 1;
+            this.handlePageChange(1);
+          }
+          // 否则，如果当前页码有效且不超过总页数，则恢复当前页码
+          else if (currentPage > 0 && currentPage <= this.totalPages) {
+            this.currentPage = currentPage;
+            this.handlePageChange(this.currentPage);
+          }
         }
       },
       immediate: true
@@ -73664,6 +73727,12 @@ function segment(word, options) {
         return;
       }
 
+      // 如果是展开状态，一定要显示“收起”按钮
+      if (this.open) {
+        this.needExpand = true;
+        return;
+      }
+
       //如果开启分页，并且分页的pageSize < this.localOptions 说明不止一页，必须有"展开"按钮
       if (this.pagination && this.pageSize < this.localOptions.length) {
         this.needExpand = true;
@@ -73806,8 +73875,8 @@ function segment(word, options) {
           this.latterList = Object.values(latterList);
         }
         this.dataList = [...this.localOptions];
-        this.currentPage = 1;
-        this.handlePageChange(1);
+        // 不重置页码，使用当前页码
+        this.handlePageChange(this.currentPage);
         if (this.multiple) {
           var selectedValues = [];
           if (this.selectedValue.length > 0 && this.dataList.length > 0) {
@@ -73926,8 +73995,8 @@ function segment(word, options) {
 ;
 var ByCommonSelector_component = normalizeComponent(
   common_selector_ByCommonSelectorvue_type_script_lang_js,
-  ByCommonSelectorvue_type_template_id_4a7ce486_render,
-  ByCommonSelectorvue_type_template_id_4a7ce486_staticRenderFns,
+  ByCommonSelectorvue_type_template_id_042a5da2_render,
+  ByCommonSelectorvue_type_template_id_042a5da2_staticRenderFns,
   false,
   null,
   null,
@@ -74077,6 +74146,27 @@ var ByCommonSelector_component = normalizeComponent(
       this.$emit('input', this.replacementData);
       // console.log('002:触发了-handleValueChange ==:', value)
     },
+    // 处理选择器+输入框的值变化
+    handleSelectorInputChange(value, item, type) {
+      if (!this.replacementData) {
+        this.replacementData = {
+          ...this.value
+        };
+      }
+      if (type === 'selector') {
+        this.replacementData[item.selectorField] = value;
+      } else if (type === 'input') {
+        this.replacementData[item.inputField] = value;
+      }
+      this.$emit('input', this.replacementData);
+      this.$emit('selector-input-change', {
+        ...item,
+        type,
+        value,
+        selectorValue: this.replacementData[item.selectorField],
+        inputValue: this.replacementData[item.inputField]
+      });
+    },
     handleRangeChange({
       startTime,
       endTime
@@ -74136,10 +74226,10 @@ var ByCommonSelector_component = normalizeComponent(
 });
 ;// ./src/components/form/form.vue?vue&type=script&lang=js
  /* harmony default export */ var form_formvue_type_script_lang_js = (formvue_type_script_lang_js); 
-;// ./node_modules/@vue/cli-service/node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/@vue/cli-service/node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/@vue/cli-service/node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/form.vue?vue&type=style&index=0&id=39a065ba&prod&lang=scss&scoped=true
+;// ./node_modules/@vue/cli-service/node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-22.use[0]!./node_modules/@vue/cli-service/node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/@vue/cli-service/node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/form.vue?vue&type=style&index=0&id=1068122a&prod&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/form/form.vue?vue&type=style&index=0&id=39a065ba&prod&lang=scss&scoped=true
+;// ./src/components/form/form.vue?vue&type=style&index=0&id=1068122a&prod&lang=scss&scoped=true
 
 ;// ./src/components/form/form.vue
 
@@ -74152,11 +74242,11 @@ var ByCommonSelector_component = normalizeComponent(
 
 var form_component = normalizeComponent(
   form_formvue_type_script_lang_js,
-  formvue_type_template_id_39a065ba_scoped_true_render,
-  formvue_type_template_id_39a065ba_scoped_true_staticRenderFns,
+  formvue_type_template_id_1068122a_scoped_true_render,
+  formvue_type_template_id_1068122a_scoped_true_staticRenderFns,
   false,
   null,
-  "39a065ba",
+  "1068122a",
   null
   
 )

package/lib/by-components.css

@@ -1 +1 @@
-.b-form .header[data-v-39a065ba]{margin-bottom:20px}.b-form .footer[data-v-39a065ba]{margin-top:20px}
+.b-form .header[data-v-1068122a]{margin-bottom:20px}.b-form .footer[data-v-1068122a]{margin-top:20px}

package/lib/by-components.umd.js

@@ -62335,8 +62335,8 @@ var table_component = normalizeComponent(
 )
 
 /* harmony default export */ var table = (table_component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/form.vue?vue&type=template&id=39a065ba&scoped=true
-var formvue_type_template_id_39a065ba_scoped_true_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/form.vue?vue&type=template&id=1068122a&scoped=true
+var formvue_type_template_id_1068122a_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -62454,6 +62454,7 @@ var formvue_type_template_id_39a065ba_scoped_true_render = function render() {
         "type": item.selectorType || 'select',
         "options": item.options || [],
         "loadOptions": item.loadOptions,
+        "hiddenAllOptions": item.hiddenAllOptions,
         "multiple": item.multiple,
         "placeholder": item.placeholder,
         "size": _vm.elSize
@@ -62463,7 +62464,44 @@ var formvue_type_template_id_39a065ba_scoped_true_render = function render() {
           return _vm.handleValueChange($event, item);
         }
       }
-    }, 'by-common-selector', item.otherOptions || {}, false))] : item.type === 'datepicker' ? [_c('el-date-picker', _vm._b({
+    }, 'by-common-selector', item.otherOptions || {}, false))] : item.type === 'commonSelectorInput' ? [_c('div', {
+      staticClass: "common-selector-input-container"
+    }, [_c('by-common-selector', _vm._b({
+      staticStyle: {
+        "width": "60%"
+      },
+      attrs: {
+        "value": _vm.value[`${item.selectorField}`],
+        "config": item,
+        "type": item.selectorType || 'select',
+        "options": item.options || [],
+        "loadOptions": item.loadOptions,
+        "hiddenAllOptions": item.hiddenAllOptions,
+        "multiple": item.multiple,
+        "placeholder": item.selectorPlaceholder || '请选择',
+        "size": _vm.elSize
+      },
+      on: {
+        "input": function ($event) {
+          return _vm.handleSelectorInputChange($event, item, 'selector');
+        }
+      }
+    }, 'by-common-selector', item.selectorOptions || {}, false)), _c('el-input', _vm._b({
+      staticStyle: {
+        "width": "180px"
+      },
+      attrs: {
+        "value": _vm.value[`${item.inputField}`],
+        "placeholder": item.inputPlaceholder || '请输入',
+        "clearable": "",
+        "size": _vm.elSize
+      },
+      on: {
+        "input": function ($event) {
+          return _vm.handleSelectorInputChange($event, item, 'input');
+        }
+      }
+    }, 'el-input', item.inputOptions || {}, false))], 1)] : item.type === 'datepicker' ? [_c('el-date-picker', _vm._b({
       staticStyle: {
         "width": "100%"
       },
@@ -62629,7 +62667,7 @@ var formvue_type_template_id_39a065ba_scoped_true_render = function render() {
     staticClass: "footer"
   }, [_vm._t("footer")], 2)], 1);
 };
-var formvue_type_template_id_39a065ba_scoped_true_staticRenderFns = [];
+var formvue_type_template_id_1068122a_scoped_true_staticRenderFns = [];
 
 ;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/comps/pair-number-input.vue?vue&type=template&id=604235f6
 var pair_number_inputvue_type_template_id_604235f6_render = function render() {
@@ -62929,8 +62967,8 @@ var custom_date_picker_component = normalizeComponent(
 )
 
 /* harmony default export */ var custom_date_picker = (custom_date_picker_component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common-selector/ByCommonSelector.vue?vue&type=template&id=4a7ce486
-var ByCommonSelectorvue_type_template_id_4a7ce486_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"7d802f52-vue-loader-template"}!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/common-selector/ByCommonSelector.vue?vue&type=template&id=042a5da2
+var ByCommonSelectorvue_type_template_id_042a5da2_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -62964,7 +63002,7 @@ var ByCommonSelectorvue_type_template_id_4a7ce486_render = function render() {
         "disabled": item.status === 0
       }
     });
-  }), 1) : [_c('el-checkbox', {
+  }), 1) : [!_vm.hiddenAllOptions ? _c('el-checkbox', {
     class: ['by_selected_all', {
       'by_border-transparent': _vm.type !== 'border'
     }],
@@ -62985,7 +63023,7 @@ var ByCommonSelectorvue_type_template_id_4a7ce486_render = function render() {
     }
   }, [_c('span', {
     staticClass: "by_checkbox-label"
-  }, [_vm._v("全部")])]), _c('div', {
+  }, [_vm._v("全部")])]) : _vm._e(), _c('div', {
     staticClass: "by_consult-select-container",
     class: {
       by_shrink: !_vm.open
@@ -63147,7 +63185,7 @@ var ByCommonSelectorvue_type_template_id_4a7ce486_render = function render() {
     }
   }, [_vm._v(" 加载中... ")]) : _vm._e()], 2);
 };
-var ByCommonSelectorvue_type_template_id_4a7ce486_staticRenderFns = [];
+var ByCommonSelectorvue_type_template_id_042a5da2_staticRenderFns = [];
 
 ;// ./node_modules/pinyin-pro/dist/index.mjs
 
@@ -73463,6 +73501,13 @@ function segment(word, options) {
       type: Function,
       default: null
     },
+    /**
+     * 是否隐藏全部选项
+     */
+    hiddenAllOptions: {
+      type: Boolean,
+      default: false
+    },
     /**
      * 是否多选
      */
@@ -73564,10 +73609,28 @@ function segment(word, options) {
       this.scheduleExpandCheck();
     },
     options: {
-      handler() {
+      handler(newOptions, oldOptions) {
         if (!this.loadOptions) {
           this.localOptions = [...this.options];
+
+          // 判断数据总量是否变化
+          const oldLength = oldOptions ? oldOptions.length : 0;
+          const newLength = newOptions ? newOptions.length : 0;
+
+          // 保存当前页码
+          const currentPage = this.currentPage;
           this.initData();
+
+          // 如果数据总量变化，重置到第一页
+          if (oldLength !== newLength) {
+            this.currentPage = 1;
+            this.handlePageChange(1);
+          }
+          // 否则，如果当前页码有效且不超过总页数，则恢复当前页码
+          else if (currentPage > 0 && currentPage <= this.totalPages) {
+            this.currentPage = currentPage;
+            this.handlePageChange(this.currentPage);
+          }
         }
       },
       immediate: true
@@ -73674,6 +73737,12 @@ function segment(word, options) {
         return;
       }
 
+      // 如果是展开状态，一定要显示“收起”按钮
+      if (this.open) {
+        this.needExpand = true;
+        return;
+      }
+
       //如果开启分页，并且分页的pageSize < this.localOptions 说明不止一页，必须有"展开"按钮
       if (this.pagination && this.pageSize < this.localOptions.length) {
         this.needExpand = true;
@@ -73816,8 +73885,8 @@ function segment(word, options) {
           this.latterList = Object.values(latterList);
         }
         this.dataList = [...this.localOptions];
-        this.currentPage = 1;
-        this.handlePageChange(1);
+        // 不重置页码，使用当前页码
+        this.handlePageChange(this.currentPage);
         if (this.multiple) {
           var selectedValues = [];
           if (this.selectedValue.length > 0 && this.dataList.length > 0) {
@@ -73936,8 +74005,8 @@ function segment(word, options) {
 ;
 var ByCommonSelector_component = normalizeComponent(
   common_selector_ByCommonSelectorvue_type_script_lang_js,
-  ByCommonSelectorvue_type_template_id_4a7ce486_render,
-  ByCommonSelectorvue_type_template_id_4a7ce486_staticRenderFns,
+  ByCommonSelectorvue_type_template_id_042a5da2_render,
+  ByCommonSelectorvue_type_template_id_042a5da2_staticRenderFns,
   false,
   null,
   null,
@@ -74087,6 +74156,27 @@ var ByCommonSelector_component = normalizeComponent(
       this.$emit('input', this.replacementData);
       // console.log('002:触发了-handleValueChange ==:', value)
     },
+    // 处理选择器+输入框的值变化
+    handleSelectorInputChange(value, item, type) {
+      if (!this.replacementData) {
+        this.replacementData = {
+          ...this.value
+        };
+      }
+      if (type === 'selector') {
+        this.replacementData[item.selectorField] = value;
+      } else if (type === 'input') {
+        this.replacementData[item.inputField] = value;
+      }
+      this.$emit('input', this.replacementData);
+      this.$emit('selector-input-change', {
+        ...item,
+        type,
+        value,
+        selectorValue: this.replacementData[item.selectorField],
+        inputValue: this.replacementData[item.inputField]
+      });
+    },
     handleRangeChange({
       startTime,
       endTime
@@ -74146,10 +74236,10 @@ var ByCommonSelector_component = normalizeComponent(
 });
 ;// ./src/components/form/form.vue?vue&type=script&lang=js
  /* harmony default export */ var form_formvue_type_script_lang_js = (formvue_type_script_lang_js); 
-;// ./node_modules/@vue/cli-service/node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-64.use[0]!./node_modules/@vue/cli-service/node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/@vue/cli-service/node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/form.vue?vue&type=style&index=0&id=39a065ba&prod&lang=scss&scoped=true
+;// ./node_modules/@vue/cli-service/node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-64.use[0]!./node_modules/@vue/cli-service/node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/@vue/cli-service/node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/cache-loader/dist/cjs.js??ruleSet[0].use[0]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./src/components/form/form.vue?vue&type=style&index=0&id=1068122a&prod&lang=scss&scoped=true
 // extracted by mini-css-extract-plugin
 
-;// ./src/components/form/form.vue?vue&type=style&index=0&id=39a065ba&prod&lang=scss&scoped=true
+;// ./src/components/form/form.vue?vue&type=style&index=0&id=1068122a&prod&lang=scss&scoped=true
 
 ;// ./src/components/form/form.vue
 
@@ -74162,11 +74252,11 @@ var ByCommonSelector_component = normalizeComponent(
 
 var form_component = normalizeComponent(
   form_formvue_type_script_lang_js,
-  formvue_type_template_id_39a065ba_scoped_true_render,
-  formvue_type_template_id_39a065ba_scoped_true_staticRenderFns,
+  formvue_type_template_id_1068122a_scoped_true_render,
+  formvue_type_template_id_1068122a_scoped_true_staticRenderFns,
   false,
   null,
-  "39a065ba",
+  "1068122a",
   null
   
 )