@weitutech/by-components 1.1.174 → 1.1.176

package/lib/by-components.common.js

@@ -13,63 +13,6 @@ module.exports = function (it) {
 };
 
 
-/***/ }),
-
-/***/ 38:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-"use strict";
-
-var fails = __webpack_require__(9039);
-var isCallable = __webpack_require__(4901);
-var isObject = __webpack_require__(34);
-var create = __webpack_require__(2360);
-var getPrototypeOf = __webpack_require__(2787);
-var defineBuiltIn = __webpack_require__(6840);
-var wellKnownSymbol = __webpack_require__(8227);
-var IS_PURE = __webpack_require__(6395);
-
-var ITERATOR = wellKnownSymbol('iterator');
-var BUGGY_SAFARI_ITERATORS = false;
-
-// `%IteratorPrototype%` object
-// https://tc39.es/ecma262/#sec-%iteratorprototype%-object
-var IteratorPrototype, PrototypeOfArrayIteratorPrototype, arrayIterator;
-
-/* eslint-disable es/no-array-prototype-keys -- safe */
-if ([].keys) {
-  arrayIterator = [].keys();
-  // Safari 8 has buggy iterators w/o `next`
-  if (!('next' in arrayIterator)) BUGGY_SAFARI_ITERATORS = true;
-  else {
-    PrototypeOfArrayIteratorPrototype = getPrototypeOf(getPrototypeOf(arrayIterator));
-    if (PrototypeOfArrayIteratorPrototype !== Object.prototype) IteratorPrototype = PrototypeOfArrayIteratorPrototype;
-  }
-}
-
-var NEW_ITERATOR_PROTOTYPE = !isObject(IteratorPrototype) || fails(function () {
-  var test = {};
-  // FF44- legacy iterators case
-  return IteratorPrototype[ITERATOR].call(test) !== test;
-});
-
-if (NEW_ITERATOR_PROTOTYPE) IteratorPrototype = {};
-else if (IS_PURE) IteratorPrototype = create(IteratorPrototype);
-
-// `%IteratorPrototype%[@@iterator]()` method
-// https://tc39.es/ecma262/#sec-%iteratorprototype%-@@iterator
-if (!isCallable(IteratorPrototype[ITERATOR])) {
-  defineBuiltIn(IteratorPrototype, ITERATOR, function () {
-    return this;
-  });
-}
-
-module.exports = {
-  IteratorPrototype: IteratorPrototype,
-  BUGGY_SAFARI_ITERATORS: BUGGY_SAFARI_ITERATORS
-};
-
-
 /***/ }),
 
 /***/ 54:
@@ -45264,6 +45207,63 @@ $({ target: 'Set', proto: true, real: true, forced: FORCED }, {
 });
 
 
+/***/ }),
+
+/***/ 7657:
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+"use strict";
+
+var fails = __webpack_require__(9039);
+var isCallable = __webpack_require__(4901);
+var isObject = __webpack_require__(34);
+var create = __webpack_require__(2360);
+var getPrototypeOf = __webpack_require__(2787);
+var defineBuiltIn = __webpack_require__(6840);
+var wellKnownSymbol = __webpack_require__(8227);
+var IS_PURE = __webpack_require__(6395);
+
+var ITERATOR = wellKnownSymbol('iterator');
+var BUGGY_SAFARI_ITERATORS = false;
+
+// `%IteratorPrototype%` object
+// https://tc39.es/ecma262/#sec-%iteratorprototype%-object
+var IteratorPrototype, PrototypeOfArrayIteratorPrototype, arrayIterator;
+
+/* eslint-disable es/no-array-prototype-keys -- safe */
+if ([].keys) {
+  arrayIterator = [].keys();
+  // Safari 8 has buggy iterators w/o `next`
+  if (!('next' in arrayIterator)) BUGGY_SAFARI_ITERATORS = true;
+  else {
+    PrototypeOfArrayIteratorPrototype = getPrototypeOf(getPrototypeOf(arrayIterator));
+    if (PrototypeOfArrayIteratorPrototype !== Object.prototype) IteratorPrototype = PrototypeOfArrayIteratorPrototype;
+  }
+}
+
+var NEW_ITERATOR_PROTOTYPE = !isObject(IteratorPrototype) || fails(function () {
+  var test = {};
+  // FF44- legacy iterators case
+  return IteratorPrototype[ITERATOR].call(test) !== test;
+});
+
+if (NEW_ITERATOR_PROTOTYPE) IteratorPrototype = {};
+else if (IS_PURE) IteratorPrototype = create(IteratorPrototype);
+
+// `%IteratorPrototype%[@@iterator]()` method
+// https://tc39.es/ecma262/#sec-%iteratorprototype%-@@iterator
+if (!isCallable(IteratorPrototype[ITERATOR])) {
+  defineBuiltIn(IteratorPrototype, ITERATOR, function () {
+    return this;
+  });
+}
+
+module.exports = {
+  IteratorPrototype: IteratorPrototype,
+  BUGGY_SAFARI_ITERATORS: BUGGY_SAFARI_ITERATORS
+};
+
+
 /***/ }),
 
 /***/ 7669:
@@ -46676,7 +46676,7 @@ var createProperty = __webpack_require__(4659);
 var fails = __webpack_require__(9039);
 var hasOwn = __webpack_require__(9297);
 var wellKnownSymbol = __webpack_require__(8227);
-var IteratorPrototype = (__webpack_require__(38).IteratorPrototype);
+var IteratorPrototype = (__webpack_require__(7657).IteratorPrototype);
 var DESCRIPTORS = __webpack_require__(3724);
 var IS_PURE = __webpack_require__(6395);
 
@@ -71515,7 +71515,7 @@ var defineBuiltIns = __webpack_require__(6279);
 var wellKnownSymbol = __webpack_require__(8227);
 var InternalStateModule = __webpack_require__(1181);
 var getMethod = __webpack_require__(5966);
-var IteratorPrototype = (__webpack_require__(38).IteratorPrototype);
+var IteratorPrototype = (__webpack_require__(7657).IteratorPrototype);
 var createIterResultObject = __webpack_require__(2529);
 var iteratorClose = __webpack_require__(9539);
 var iteratorCloseAll = __webpack_require__(1385);
@@ -74524,8 +74524,8 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var pager = (component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5daa4f39-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/table/index.vue?vue&type=template&id=6b5adccc
-var tablevue_type_template_id_6b5adccc_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5daa4f39-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/table/index.vue?vue&type=template&id=35ba1298
+var tablevue_type_template_id_35ba1298_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('vxe-grid', _vm._g(_vm._b({
@@ -74609,7 +74609,7 @@ var tablevue_type_template_id_6b5adccc_render = function render() {
     }
   }) : _vm._e()], 1);
 };
-var tablevue_type_template_id_6b5adccc_staticRenderFns = [];
+var tablevue_type_template_id_35ba1298_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -76773,6 +76773,9 @@ var custom_column_component = normalizeComponent(
       // 为表头补充tooltips展示能力
       newColumns = this.applyColumnTooltips(newColumns);
 
+      // 为列应用默认的对齐方式（如果列本身没有配置）
+      newColumns = this.applyDefaultAlign(newColumns);
+
       // 处理前端分页和虚拟滚动
       let data = others.data || [];
       if ((_others$pagerConfig = others.pagerConfig) !== null && _others$pagerConfig !== void 0 && _others$pagerConfig.frontendPagination || (_others$sortConfig = others.sortConfig) !== null && _others$sortConfig !== void 0 && _others$sortConfig.frontendSort) {
@@ -76816,8 +76819,9 @@ var custom_column_component = normalizeComponent(
         } : {
           height: 720
         }),
-        // 表格级别的默认对齐：headerAlign 默认居中，align 默认居左（如果外部有配置，以外部配置为准）
-        align: 'center',
+        // 表格级别的默认对齐：如果外部有配置，以外部配置为准，否则使用默认值
+        align: this.gridOptions.align !== undefined && this.gridOptions.align !== null ? this.gridOptions.align : 'center',
+        headerAlign: this.gridOptions.headerAlign !== undefined && this.gridOptions.headerAlign !== null ? this.gridOptions.headerAlign : 'center',
         copyFields: this.gridOptions.copyFields || [],
         emptyText: this.gridOptions.emptyText || '暂无数据',
         loading: this.loading,
@@ -76967,6 +76971,34 @@ var custom_column_component = normalizeComponent(
         return newColumn;
       });
     },
+    /**
+     * 为列应用默认的对齐方式（如果列本身没有配置）
+     * @param {Array} columns
+     */
+    applyDefaultAlign(columns) {
+      if (!Array.isArray(columns)) return columns;
+      const defaultAlign = this.gridOptions.align !== undefined && this.gridOptions.align !== null ? this.gridOptions.align : 'center';
+      const defaultHeaderAlign = this.gridOptions.headerAlign !== undefined && this.gridOptions.headerAlign !== null ? this.gridOptions.headerAlign : 'center';
+      return columns.map(column => {
+        const newColumn = {
+          ...column
+        };
+        if (Array.isArray(newColumn.children) && newColumn.children.length) {
+          newColumn.children = this.applyDefaultAlign(newColumn.children);
+        }
+
+        // 如果列没有配置 align，应用默认值
+        if (newColumn.align === undefined || newColumn.align === null) {
+          newColumn.align = defaultAlign;
+        }
+
+        // 如果列没有配置 headerAlign，应用默认值（只有有 field 的列才需要 headerAlign）
+        if (newColumn.field && (newColumn.headerAlign === undefined || newColumn.headerAlign === null)) {
+          newColumn.headerAlign = defaultHeaderAlign;
+        }
+        return newColumn;
+      });
+    },
     /**
      * 规范化列配置上的tooltips字段
      * @param {string|Object} tooltips
@@ -77187,8 +77219,8 @@ var custom_column_component = normalizeComponent(
       if (item.align !== undefined && item.align !== null) {
         return item.align;
       }
-      if (item.headerAlign !== undefined && item.headerAlign !== null) {
-        return item.headerAlign;
+      if (this.gridOptions.align !== undefined && this.gridOptions.align !== null) {
+        return this.gridOptions.align;
       }
       return 'center';
     },
@@ -77196,8 +77228,8 @@ var custom_column_component = normalizeComponent(
       if (item.headerAlign !== undefined && item.headerAlign !== null) {
         return item.headerAlign;
       }
-      if (item.align !== undefined && item.align !== null) {
-        return item.align;
+      if (this.gridOptions.headerAlign !== undefined && this.gridOptions.headerAlign !== null) {
+        return this.gridOptions.headerAlign;
       }
       return 'center';
     },
@@ -77495,8 +77527,8 @@ var custom_column_component = normalizeComponent(
 ;
 var table_component = normalizeComponent(
   components_tablevue_type_script_lang_js,
-  tablevue_type_template_id_6b5adccc_render,
-  tablevue_type_template_id_6b5adccc_staticRenderFns,
+  tablevue_type_template_id_35ba1298_render,
+  tablevue_type_template_id_35ba1298_staticRenderFns,
   false,
   null,
   null,

package/lib/by-components.umd.js

@@ -74534,8 +74534,8 @@ var component = normalizeComponent(
 )
 
 /* harmony default export */ var pager = (component.exports);
-;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5daa4f39-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/table/index.vue?vue&type=template&id=6b5adccc
-var tablevue_type_template_id_6b5adccc_render = function render() {
+;// ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"5daa4f39-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/table/index.vue?vue&type=template&id=35ba1298
+var tablevue_type_template_id_35ba1298_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('vxe-grid', _vm._g(_vm._b({
@@ -74619,7 +74619,7 @@ var tablevue_type_template_id_6b5adccc_render = function render() {
     }
   }) : _vm._e()], 1);
 };
-var tablevue_type_template_id_6b5adccc_staticRenderFns = [];
+var tablevue_type_template_id_35ba1298_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
@@ -76783,6 +76783,9 @@ var custom_column_component = normalizeComponent(
       // 为表头补充tooltips展示能力
       newColumns = this.applyColumnTooltips(newColumns);
 
+      // 为列应用默认的对齐方式（如果列本身没有配置）
+      newColumns = this.applyDefaultAlign(newColumns);
+
       // 处理前端分页和虚拟滚动
       let data = others.data || [];
       if ((_others$pagerConfig = others.pagerConfig) !== null && _others$pagerConfig !== void 0 && _others$pagerConfig.frontendPagination || (_others$sortConfig = others.sortConfig) !== null && _others$sortConfig !== void 0 && _others$sortConfig.frontendSort) {
@@ -76826,8 +76829,9 @@ var custom_column_component = normalizeComponent(
         } : {
           height: 720
         }),
-        // 表格级别的默认对齐：headerAlign 默认居中，align 默认居左（如果外部有配置，以外部配置为准）
-        align: 'center',
+        // 表格级别的默认对齐：如果外部有配置，以外部配置为准，否则使用默认值
+        align: this.gridOptions.align !== undefined && this.gridOptions.align !== null ? this.gridOptions.align : 'center',
+        headerAlign: this.gridOptions.headerAlign !== undefined && this.gridOptions.headerAlign !== null ? this.gridOptions.headerAlign : 'center',
         copyFields: this.gridOptions.copyFields || [],
         emptyText: this.gridOptions.emptyText || '暂无数据',
         loading: this.loading,
@@ -76977,6 +76981,34 @@ var custom_column_component = normalizeComponent(
         return newColumn;
       });
     },
+    /**
+     * 为列应用默认的对齐方式（如果列本身没有配置）
+     * @param {Array} columns
+     */
+    applyDefaultAlign(columns) {
+      if (!Array.isArray(columns)) return columns;
+      const defaultAlign = this.gridOptions.align !== undefined && this.gridOptions.align !== null ? this.gridOptions.align : 'center';
+      const defaultHeaderAlign = this.gridOptions.headerAlign !== undefined && this.gridOptions.headerAlign !== null ? this.gridOptions.headerAlign : 'center';
+      return columns.map(column => {
+        const newColumn = {
+          ...column
+        };
+        if (Array.isArray(newColumn.children) && newColumn.children.length) {
+          newColumn.children = this.applyDefaultAlign(newColumn.children);
+        }
+
+        // 如果列没有配置 align，应用默认值
+        if (newColumn.align === undefined || newColumn.align === null) {
+          newColumn.align = defaultAlign;
+        }
+
+        // 如果列没有配置 headerAlign，应用默认值（只有有 field 的列才需要 headerAlign）
+        if (newColumn.field && (newColumn.headerAlign === undefined || newColumn.headerAlign === null)) {
+          newColumn.headerAlign = defaultHeaderAlign;
+        }
+        return newColumn;
+      });
+    },
     /**
      * 规范化列配置上的tooltips字段
      * @param {string|Object} tooltips
@@ -77197,8 +77229,8 @@ var custom_column_component = normalizeComponent(
       if (item.align !== undefined && item.align !== null) {
         return item.align;
       }
-      if (item.headerAlign !== undefined && item.headerAlign !== null) {
-        return item.headerAlign;
+      if (this.gridOptions.align !== undefined && this.gridOptions.align !== null) {
+        return this.gridOptions.align;
       }
       return 'center';
     },
@@ -77206,8 +77238,8 @@ var custom_column_component = normalizeComponent(
       if (item.headerAlign !== undefined && item.headerAlign !== null) {
         return item.headerAlign;
       }
-      if (item.align !== undefined && item.align !== null) {
-        return item.align;
+      if (this.gridOptions.headerAlign !== undefined && this.gridOptions.headerAlign !== null) {
+        return this.gridOptions.headerAlign;
       }
       return 'center';
     },
@@ -77505,8 +77537,8 @@ var custom_column_component = normalizeComponent(
 ;
 var table_component = normalizeComponent(
   components_tablevue_type_script_lang_js,
-  tablevue_type_template_id_6b5adccc_render,
-  tablevue_type_template_id_6b5adccc_staticRenderFns,
+  tablevue_type_template_id_35ba1298_render,
+  tablevue_type_template_id_35ba1298_staticRenderFns,
   false,
   null,
   null,