@weitutech/by-components 1.1.139 → 1.1.141

package/lib/by-components.common.js

@@ -60849,8 +60849,8 @@ var es_set_is_superset_of_v2 = __webpack_require__(2475);
 var es_set_symmetric_difference_v2 = __webpack_require__(5024);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.set.union.v2.js
 var es_set_union_v2 = __webpack_require__(1698);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ffbc40de-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/custom-column/index.vue?vue&type=template&id=22c5acce
-var custom_columnvue_type_template_id_22c5acce_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ffbc40de-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/custom-column/index.vue?vue&type=template&id=3819a338
+var custom_columnvue_type_template_id_3819a338_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -61051,7 +61051,7 @@ var custom_columnvue_type_template_id_22c5acce_render = function render() {
     }) : _vm._e()]);
   }), 0)], 1)], 1)], 1)])])])], 1);
 };
-var custom_columnvue_type_template_id_22c5acce_staticRenderFns = [];
+var custom_columnvue_type_template_id_3819a338_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.filter.js
 var es_iterator_filter = __webpack_require__(2489);
@@ -61593,7 +61593,7 @@ const isNullValue = value => {
         this.checkBoxMenu = this.deepClone(initColumn);
         this.draggableMenu = setDraggableMenu(this.checkBoxMenu);
       } else {
-        // console.log('==========从未被保存过', initColumn)
+        console.log('==========从未被保存过', initColumn);
 
         // 从未被保存过
         let num = 0;
@@ -61604,7 +61604,8 @@ const isNullValue = value => {
             col.width = col.width ? +col.width : 0;
             col.sort = num;
             // 设置 fixed 和 parent 属性
-            col.fixed = cols.fixed;
+            // 优先使用列自身的 fixed 属性，如果列上没有再使用分组的 fixed 属性
+            col.fixed = col.fixed || cols.fixed;
             col.parent = {
               label: cols.label
             };
@@ -61757,8 +61758,8 @@ const isNullValue = value => {
 ;
 var custom_column_component = normalizeComponent(
   components_custom_columnvue_type_script_lang_js,
-  custom_columnvue_type_template_id_22c5acce_render,
-  custom_columnvue_type_template_id_22c5acce_staticRenderFns,
+  custom_columnvue_type_template_id_3819a338_render,
+  custom_columnvue_type_template_id_3819a338_staticRenderFns,
   false,
   null,
   null,
@@ -80275,8 +80276,8 @@ var ByFloatingMenu_component = normalizeComponent(
 )
 
 /* harmony default export */ var ByFloatingMenu = (ByFloatingMenu_component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ffbc40de-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/popover-selector/ByPopoverSelector.vue?vue&type=template&id=8c19d5bc
-var ByPopoverSelectorvue_type_template_id_8c19d5bc_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ffbc40de-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/popover-selector/ByPopoverSelector.vue?vue&type=template&id=59b52a66
+var ByPopoverSelectorvue_type_template_id_59b52a66_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -80409,7 +80410,7 @@ var ByPopoverSelectorvue_type_template_id_8c19d5bc_render = function render() {
       "disabled": _vm.disabled,
       "loading": _vm.loading
     }
-  }, [_vm._v(" " + _vm._s(_vm.buttonText) + " ")]), _c('el-button', {
+  }, [_vm._v(" " + _vm._s(_vm.buttonText) + " ")]), _vm.showRefresh ? _c('el-button', {
     staticClass: "refresh-button",
     attrs: {
       "type": "text",
@@ -80423,9 +80424,9 @@ var ByPopoverSelectorvue_type_template_id_8c19d5bc_render = function render() {
         return _vm.handleRefresh.apply(null, arguments);
       }
     }
-  })], 1)])], 1);
+  }) : _vm._e()], 1)])], 1);
 };
-var ByPopoverSelectorvue_type_template_id_8c19d5bc_staticRenderFns = [];
+var ByPopoverSelectorvue_type_template_id_59b52a66_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/popover-selector/ByPopoverSelector.vue?vue&type=script&lang=js
 
@@ -80708,8 +80709,8 @@ var ByPopoverSelectorvue_type_template_id_8c19d5bc_staticRenderFns = [];
 ;
 var ByPopoverSelector_component = normalizeComponent(
   popover_selector_ByPopoverSelectorvue_type_script_lang_js,
-  ByPopoverSelectorvue_type_template_id_8c19d5bc_render,
-  ByPopoverSelectorvue_type_template_id_8c19d5bc_staticRenderFns,
+  ByPopoverSelectorvue_type_template_id_59b52a66_render,
+  ByPopoverSelectorvue_type_template_id_59b52a66_staticRenderFns,
   false,
   null,
   null,

package/lib/by-components.umd.js

@@ -60859,8 +60859,8 @@ var es_set_is_superset_of_v2 = __webpack_require__(2475);
 var es_set_symmetric_difference_v2 = __webpack_require__(5024);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.set.union.v2.js
 var es_set_union_v2 = __webpack_require__(1698);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ffbc40de-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/custom-column/index.vue?vue&type=template&id=22c5acce
-var custom_columnvue_type_template_id_22c5acce_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ffbc40de-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/custom-column/index.vue?vue&type=template&id=3819a338
+var custom_columnvue_type_template_id_3819a338_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -61061,7 +61061,7 @@ var custom_columnvue_type_template_id_22c5acce_render = function render() {
     }) : _vm._e()]);
   }), 0)], 1)], 1)], 1)])])])], 1);
 };
-var custom_columnvue_type_template_id_22c5acce_staticRenderFns = [];
+var custom_columnvue_type_template_id_3819a338_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.iterator.filter.js
 var es_iterator_filter = __webpack_require__(2489);
@@ -61603,7 +61603,7 @@ const isNullValue = value => {
         this.checkBoxMenu = this.deepClone(initColumn);
         this.draggableMenu = setDraggableMenu(this.checkBoxMenu);
       } else {
-        // console.log('==========从未被保存过', initColumn)
+        console.log('==========从未被保存过', initColumn);
 
         // 从未被保存过
         let num = 0;
@@ -61614,7 +61614,8 @@ const isNullValue = value => {
             col.width = col.width ? +col.width : 0;
             col.sort = num;
             // 设置 fixed 和 parent 属性
-            col.fixed = cols.fixed;
+            // 优先使用列自身的 fixed 属性，如果列上没有再使用分组的 fixed 属性
+            col.fixed = col.fixed || cols.fixed;
             col.parent = {
               label: cols.label
             };
@@ -61767,8 +61768,8 @@ const isNullValue = value => {
 ;
 var custom_column_component = normalizeComponent(
   components_custom_columnvue_type_script_lang_js,
-  custom_columnvue_type_template_id_22c5acce_render,
-  custom_columnvue_type_template_id_22c5acce_staticRenderFns,
+  custom_columnvue_type_template_id_3819a338_render,
+  custom_columnvue_type_template_id_3819a338_staticRenderFns,
   false,
   null,
   null,
@@ -80285,8 +80286,8 @@ var ByFloatingMenu_component = normalizeComponent(
 )
 
 /* harmony default export */ var ByFloatingMenu = (ByFloatingMenu_component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ffbc40de-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/popover-selector/ByPopoverSelector.vue?vue&type=template&id=8c19d5bc
-var ByPopoverSelectorvue_type_template_id_8c19d5bc_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"ffbc40de-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/popover-selector/ByPopoverSelector.vue?vue&type=template&id=59b52a66
+var ByPopoverSelectorvue_type_template_id_59b52a66_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -80419,7 +80420,7 @@ var ByPopoverSelectorvue_type_template_id_8c19d5bc_render = function render() {
       "disabled": _vm.disabled,
       "loading": _vm.loading
     }
-  }, [_vm._v(" " + _vm._s(_vm.buttonText) + " ")]), _c('el-button', {
+  }, [_vm._v(" " + _vm._s(_vm.buttonText) + " ")]), _vm.showRefresh ? _c('el-button', {
     staticClass: "refresh-button",
     attrs: {
       "type": "text",
@@ -80433,9 +80434,9 @@ var ByPopoverSelectorvue_type_template_id_8c19d5bc_render = function render() {
         return _vm.handleRefresh.apply(null, arguments);
       }
     }
-  })], 1)])], 1);
+  }) : _vm._e()], 1)])], 1);
 };
-var ByPopoverSelectorvue_type_template_id_8c19d5bc_staticRenderFns = [];
+var ByPopoverSelectorvue_type_template_id_59b52a66_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.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/popover-selector/ByPopoverSelector.vue?vue&type=script&lang=js
 
@@ -80718,8 +80719,8 @@ var ByPopoverSelectorvue_type_template_id_8c19d5bc_staticRenderFns = [];
 ;
 var ByPopoverSelector_component = normalizeComponent(
   popover_selector_ByPopoverSelectorvue_type_script_lang_js,
-  ByPopoverSelectorvue_type_template_id_8c19d5bc_render,
-  ByPopoverSelectorvue_type_template_id_8c19d5bc_staticRenderFns,
+  ByPopoverSelectorvue_type_template_id_59b52a66_render,
+  ByPopoverSelectorvue_type_template_id_59b52a66_staticRenderFns,
   false,
   null,
   null,