@weitutech/by-components 1.1.140 → 1.1.141

package/lib/by-components.common.js

@@ -11711,7 +11711,7 @@ var call = __webpack_require__(9565);
 var anObject = __webpack_require__(8551);
 var tryToString = __webpack_require__(6823);
 var isArrayIteratorMethod = __webpack_require__(4209);
-var lengthOfArrayLike = __webpack_require__(3817);
+var lengthOfArrayLike = __webpack_require__(6198);
 var isPrototypeOf = __webpack_require__(1625);
 var getIterator = __webpack_require__(81);
 var getIteratorMethod = __webpack_require__(851);
@@ -15962,22 +15962,6 @@ module.exports = function (obj) {
 };
 
 
-/***/ }),
-
-/***/ 3817:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-
-var toLength = __webpack_require__(8014);
-
-// `LengthOfArrayLike` abstract operation
-// https://tc39.es/ecma262/#sec-lengthofarraylike
-module.exports = function (obj) {
-  return toLength(obj.length);
-};
-
-
 /***/ }),
 
 /***/ 3838:
@@ -16502,7 +16486,7 @@ module.exports = function (it) {
 
 var $ = __webpack_require__(6518);
 var toObject = __webpack_require__(8981);
-var lengthOfArrayLike = __webpack_require__(3817);
+var lengthOfArrayLike = __webpack_require__(6198);
 var setArrayLength = __webpack_require__(4527);
 var doesNotExceedSafeInteger = __webpack_require__(6837);
 var fails = __webpack_require__(9039);
@@ -28940,6 +28924,22 @@ module.exports = function (key) {
   return ne;
 });
 
+/***/ }),
+
+/***/ 6198:
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+"use strict";
+
+var toLength = __webpack_require__(8014);
+
+// `LengthOfArrayLike` abstract operation
+// https://tc39.es/ecma262/#sec-lengthofarraylike
+module.exports = function (obj) {
+  return toLength(obj.length);
+};
+
+
 /***/ }),
 
 /***/ 6211:
@@ -58989,7 +58989,7 @@ module.exports = function (it) {
 
 var toIndexedObject = __webpack_require__(5397);
 var toAbsoluteIndex = __webpack_require__(5610);
-var lengthOfArrayLike = __webpack_require__(3817);
+var lengthOfArrayLike = __webpack_require__(6198);
 
 // `Array.prototype.{ indexOf, includes }` methods implementation
 var createMethod = function (IS_INCLUDES) {
@@ -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,

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,