@weitutech/by-components 1.1.58 → 1.1.60

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=486e2e6e&scoped=true
+var formvue_type_template_id_486e2e6e_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,50 @@ 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",
+      staticStyle: {
+        "display": "flex",
+        "align-items": "center",
+        "gap": "10px"
+      }
+    }, [_c('by-common-selector', _vm._b({
+      style: {
+        width: 'auto',
+        minWidth: item.selectorMinWidth || '400px'
+      },
+      attrs: {
+        "value": _vm.value[`${item.selectorField}`],
+        "config": item,
+        "type": item.selectorType || 'select',
+        "options": item.options || [],
+        "loadOptions": item.loadOptions,
+        "hiddenAllOptions": item.hiddenAllOptions !== false,
+        "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 +62663,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_486e2e6e_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 +62963,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=566c9c32
-var ByCommonSelectorvue_type_template_id_566c9c32_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=9cec9c70
+var ByCommonSelectorvue_type_template_id_9cec9c70_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -62954,7 +62998,7 @@ var ByCommonSelectorvue_type_template_id_566c9c32_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 +63019,7 @@ var ByCommonSelectorvue_type_template_id_566c9c32_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 +63181,7 @@ var ByCommonSelectorvue_type_template_id_566c9c32_render = function render() {
     }
   }, [_vm._v(" 加载中... ")]) : _vm._e()], 2);
 };
-var ByCommonSelectorvue_type_template_id_566c9c32_staticRenderFns = [];
+var ByCommonSelectorvue_type_template_id_9cec9c70_staticRenderFns = [];
 
 ;// ./node_modules/pinyin-pro/dist/index.mjs
 
@@ -73453,6 +73497,13 @@ function segment(word, options) {
       type: Function,
       default: null
     },
+    /**
+     * 是否隐藏全部选项
+     */
+    hiddenAllOptions: {
+      type: Boolean,
+      default: false
+    },
     /**
      * 是否多选
      */
@@ -73677,11 +73728,18 @@ function segment(word, options) {
     },
     // 检查是否需要展开按钮
     checkNeedExpand() {
+      var _this$$el;
       if (this.type === 'select') {
         this.needExpand = false;
         return;
       }
 
+      // 如果是展开状态，一定要显示"收起"按钮
+      if (this.open) {
+        this.needExpand = true;
+        return;
+      }
+
       //如果开启分页，并且分页的pageSize < this.localOptions 说明不止一页，必须有"展开"按钮
       if (this.pagination && this.pageSize < this.localOptions.length) {
         this.needExpand = true;
@@ -73689,8 +73747,11 @@ function segment(word, options) {
       }
 
       // 获取容器元素
-      const container = this.$el.querySelector('.by_consult-select-container');
-      if (!container) return;
+      const container = (_this$$el = this.$el) === null || _this$$el === void 0 ? void 0 : _this$$el.querySelector('.by_consult-select-container');
+      if (!container) {
+        // 如果找不到容器，保持当前状态不变
+        return;
+      }
 
       // 获取所有选项元素
       const items = container.querySelectorAll('.el-checkbox, .el-radio');
@@ -73722,11 +73783,20 @@ function segment(word, options) {
         if (!containerWidth) containerWidth = 500;
 
         // 如果总宽度超过容器宽度，则需要展开按钮
-        this.needExpand = totalWidth > containerWidth;
+        const needExpand = totalWidth > containerWidth;
+
+        // 只有在状态变化时才更新，减少不必要的重渲染
+        if (this.needExpand !== needExpand) {
+          this.needExpand = needExpand;
+        }
       } catch (error) {
         // 出错时默认显示展开按钮
+        console.error('检查展开按钮状态时出错:', error);
         this.needExpand = true;
       }
+
+      // 返回当前的展开状态，方便外部调用时获取结果
+      return this.needExpand;
     },
     // 异步加载数据
     async fetchOptions() {
@@ -73944,8 +74014,8 @@ function segment(word, options) {
 ;
 var ByCommonSelector_component = normalizeComponent(
   common_selector_ByCommonSelectorvue_type_script_lang_js,
-  ByCommonSelectorvue_type_template_id_566c9c32_render,
-  ByCommonSelectorvue_type_template_id_566c9c32_staticRenderFns,
+  ByCommonSelectorvue_type_template_id_9cec9c70_render,
+  ByCommonSelectorvue_type_template_id_9cec9c70_staticRenderFns,
   false,
   null,
   null,
@@ -73958,6 +74028,9 @@ var ByCommonSelector_component = normalizeComponent(
 
 
 
+
+
+
 /* harmony default export */ var formvue_type_script_lang_js = ({
   name: 'ByForm',
   components: {
@@ -74068,9 +74141,53 @@ var ByCommonSelector_component = normalizeComponent(
       },
       deep: true,
       immediate: true
+    },
+    // 监听isFlexible变化，更新ByCommonSelector组件的展开状态
+    isFlexible(newVal, oldVal) {
+      if (newVal !== oldVal) {
+        // 在下一个DOM更新周期中调用所有by-common-selector组件的checkNeedExpand方法
+        this.$nextTick(() => {
+          this.updateCommonSelectorExpandState();
+        });
+      }
     }
   },
   methods: {
+    // 更新所有ByCommonSelector组件的展开状态
+    updateCommonSelectorExpandState() {
+      // 查找所有ByCommonSelector组件实例
+      const selectorComponents = this.findByCommonSelectorComponents(this);
+
+      // 调用每个组件的checkNeedExpand方法
+      selectorComponents.forEach(component => {
+        if (component && typeof component.checkNeedExpand === 'function') {
+          component.checkNeedExpand();
+          // 同时调用scheduleExpandCheck以确保正确处理
+          if (typeof component.scheduleExpandCheck === 'function') {
+            component.scheduleExpandCheck();
+          }
+        }
+      });
+    },
+    // 递归查找所有ByCommonSelector组件
+    findByCommonSelectorComponents(component) {
+      let components = [];
+
+      // 检查当前组件的$children
+      if (component.$children && component.$children.length > 0) {
+        component.$children.forEach(child => {
+          // 如果是ByCommonSelector组件
+          if (child.$options && child.$options.name === 'ByCommonSelector') {
+            components.push(child);
+          }
+
+          // 递归查找子组件的子组件
+          const childComponents = this.findByCommonSelectorComponents(child);
+          components = components.concat(childComponents);
+        });
+      }
+      return components;
+    },
     validate(cb = () => {}) {
       this.$refs.formRef.validate((valid, obj) => {
         cb(valid, obj);
@@ -74095,6 +74212,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
@@ -74134,6 +74272,8 @@ var ByCommonSelector_component = normalizeComponent(
       });
       this.$nextTick(() => {
         this.$emit('reset');
+        // 重置后更新选择器状态
+        this.updateCommonSelectorExpandState();
       });
     },
     handleSelectLoadSuccess(options, item) {
@@ -74154,10 +74294,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=486e2e6e&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=486e2e6e&prod&lang=scss&scoped=true
 
 ;// ./src/components/form/form.vue
 
@@ -74170,23 +74310,24 @@ 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_486e2e6e_scoped_true_render,
+  formvue_type_template_id_486e2e6e_scoped_true_staticRenderFns,
   false,
   null,
-  "39a065ba",
+  "486e2e6e",
   null
   
 )
 
 /* harmony default export */ var form_form = (form_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/page-search/page-search.vue?vue&type=template&id=642560df
-var page_searchvue_type_template_id_642560df_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/page-search/page-search.vue?vue&type=template&id=d39cfe72
+var page_searchvue_type_template_id_d39cfe72_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
     staticClass: "b-page-search"
   }, [_c('by-form', _vm._b({
+    ref: "searchForm",
     attrs: {
       "value": _vm.formData,
       "is-flexible": _vm.unfold
@@ -74227,7 +74368,7 @@ var page_searchvue_type_template_id_642560df_render = function render() {
     })], null, true)
   }, 'by-form', _vm.searchFormConfig, false))], 1);
 };
-var page_searchvue_type_template_id_642560df_staticRenderFns = [];
+var page_searchvue_type_template_id_d39cfe72_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./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/page-search/page-search.vue?vue&type=script&lang=js
 
@@ -74341,8 +74482,8 @@ var page_searchvue_type_template_id_642560df_staticRenderFns = [];
 ;
 var page_search_component = normalizeComponent(
   page_search_page_searchvue_type_script_lang_js,
-  page_searchvue_type_template_id_642560df_render,
-  page_searchvue_type_template_id_642560df_staticRenderFns,
+  page_searchvue_type_template_id_d39cfe72_render,
+  page_searchvue_type_template_id_d39cfe72_staticRenderFns,
   false,
   null,
   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-486e2e6e]{margin-bottom:20px}.b-form .footer[data-v-486e2e6e]{margin-top:20px}