bkui-vue 0.0.2-beta.112 → 0.0.2-beta.114

package/lib/select/index.js

@@ -1640,9 +1640,19 @@ function select_objectSpread(target) { for (var i = 1; i < arguments.length; i++
         setTimeout(function () {
           focusInput();
           initActiveOptionValue();
+          scrollActiveOptionIntoView();
         }, 10); // 等待Popover content出来，options加载完成
       }
     });
+    // 滚动到当前选中的options中
+    var scrollActiveOptionIntoView = function scrollActiveOptionIntoView() {
+      var _contentRef$value, _contentRef$value$que, _optionsDom$;
+      var optionsDom = (_contentRef$value = contentRef.value) === null || _contentRef$value === void 0 || (_contentRef$value$que = _contentRef$value.querySelectorAll) === null || _contentRef$value$que === void 0 ? void 0 : _contentRef$value$que.call(_contentRef$value, '.is-selected');
+      (_optionsDom$ = optionsDom[0]) === null || _optionsDom$ === void 0 ? void 0 : _optionsDom$.scrollIntoView({
+        block: 'center',
+        behavior: 'smooth'
+      });
+    };
     // 初始化当前悬浮的option项
     var initActiveOptionValue = function initActiveOptionValue() {
       var firstSelected = selected.value[0];

package/lib/table/index.js

@@ -3005,9 +3005,13 @@ var getElementTextWidth = function getElementTextWidth(element, text) {
   return getTextWidth(text || (element === null || element === void 0 ? void 0 : element.innerHTML), getCanvasFont(element));
 };
 var isColumnHidden = function isColumnHidden(settingFields, column, checked) {
+  var getFieldValue = function getFieldValue(field) {
+    var _field$field;
+    return (_field$field = field.field) !== null && _field$field !== void 0 ? _field$field : field.id;
+  };
   var isSettingField = function isSettingField(col) {
     return settingFields.some(function (field) {
-      return field.field === resolvePropVal(col, ['field', 'type'], [col]);
+      return getFieldValue(field) === resolvePropVal(col, ['field', 'type'], [col]);
     });
   };
   return isSettingField(column) && checked.length && !checked.includes(resolvePropVal(column, ['field', 'type'], [column]));
@@ -3168,18 +3172,28 @@ function use_attributes_objectSpread(target) { for (var i = 1; i < arguments.len
 
 
 /* harmony default export */ const use_attributes = (function (props) {
-  var _props$settings, _props$settings2;
-  var size = props.settings.size;
-  var height = SETTING_SIZE[size] || SETTING_SIZE.small;
+  var getDefaultSettings = function getDefaultSettings() {
+    var _ref, _SETTING_SIZE$size;
+    var _props$settings = props.settings,
+      size = _props$settings.size,
+      _props$settings$field = _props$settings.fields,
+      fields = _props$settings$field === void 0 ? [] : _props$settings$field,
+      _props$settings$check = _props$settings.checked,
+      checked = _props$settings$check === void 0 ? [] : _props$settings$check;
+    var height = (_ref = (_SETTING_SIZE$size = SETTING_SIZE[size]) !== null && _SETTING_SIZE$size !== void 0 ? _SETTING_SIZE$size : props.rowHeight) !== null && _ref !== void 0 ? _ref : SETTING_SIZE.small;
+    return {
+      size: size,
+      height: height,
+      fields: fields,
+      checked: checked
+    };
+  };
   var formatData = (0,external_vue_namespaceObject.reactive)({
     data: _toConsumableArray(props.data),
     dataSchema: new WeakMap(),
     columns: _toConsumableArray(props.columns),
     columnSchema: new WeakMap(),
-    settings: {
-      size: size,
-      height: height
-    },
+    settings: getDefaultSettings(),
     layout: {
       hasScrollY: false,
       bottom: 0,
@@ -3194,6 +3208,27 @@ function use_attributes_objectSpread(target) { for (var i = 1; i < arguments.len
     multiFilter = _usePagination.multiFilter,
     sort = _usePagination.sort,
     resetStartEndIndex = _usePagination.resetStartEndIndex;
+  var updateSettings = function updateSettings(settings, rowHeight) {
+    if (settings) {
+      var _ref2, _ref3;
+      var size = settings.size,
+        _settings$fields = settings.fields,
+        fields = _settings$fields === void 0 ? [] : _settings$fields,
+        _settings$checked = settings.checked,
+        checked = _settings$checked === void 0 ? [] : _settings$checked;
+      var height = (_ref2 = (_ref3 = rowHeight !== null && rowHeight !== void 0 ? rowHeight : SETTING_SIZE[size]) !== null && _ref3 !== void 0 ? _ref3 : props.rowHeight) !== null && _ref2 !== void 0 ? _ref2 : SETTING_SIZE.small;
+      Object.assign(formatData.settings, {
+        size: size,
+        height: height,
+        fields: fields,
+        checked: checked
+      });
+      return;
+    }
+    if (rowHeight) {
+      formatData.settings.height = rowHeight;
+    }
+  };
   var resolveMinWidth = function resolveMinWidth(col) {
     if (/^\d+/.test("".concat(col.minWidth))) {
       return col.minWidth;
@@ -3207,8 +3242,6 @@ function use_attributes_objectSpread(target) { for (var i = 1; i < arguments.len
     }
     return minWidth;
   };
-  var checked = ((_props$settings = props.settings) === null || _props$settings === void 0 ? void 0 : _props$settings.checked) || [];
-  var settingFields = ((_props$settings2 = props.settings) === null || _props$settings2 === void 0 ? void 0 : _props$settings2.fields) || [];
   /**
    * Format columns
    * @param columns
@@ -3221,14 +3254,14 @@ function use_attributes_objectSpread(target) { for (var i = 1; i < arguments.len
     var needColSpan = neepColspanOrRowspan(['colspan']);
     (columns || []).forEach(function (col, index) {
       var _Object$assign;
-      var _ref = needColSpan ? getColumnSpanConfig(col, index, skipColNum) : {
+      var _ref4 = needColSpan ? getColumnSpanConfig(col, index, skipColNum) : {
           skipCol: false,
           skipColumnNum: 0,
           skipColLen: 0
         },
-        skipCol = _ref.skipCol,
-        skipColumnNum = _ref.skipColumnNum,
-        skipColLen = _ref.skipColLen;
+        skipCol = _ref4.skipCol,
+        skipColumnNum = _ref4.skipColumnNum,
+        skipColLen = _ref4.skipColLen;
       skipColNum = skipColumnNum;
       if (!formatData.columnSchema.has(col)) {
         var _formatData$columnSch;
@@ -3237,7 +3270,7 @@ function use_attributes_objectSpread(target) { for (var i = 1; i < arguments.len
           fn = _resolveColumnSortPro.fn,
           scope = _resolveColumnSortPro.scope,
           active = _resolveColumnSortPro.active;
-        formatData.columnSchema.set(col, (_formatData$columnSch = {}, defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.CALC_WIDTH, undefined), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.RESIZE_WIDTH, undefined), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_MIN_WIDTH, resolveMinWidth(col)), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.LISTENERS, new Map()), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.WIDTH, col.width), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.IS_HIDDEN, isColumnHidden(settingFields, col, checked)), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_SORT_TYPE, type), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_SORT_FN, fn), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_FILTER_FN, undefined), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_FILTER_SCOPE, undefined), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_SORT_SCOPE, scope), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_SORT_ACTIVE, active), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_IS_DRAG, false), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_SPAN, {
+        formatData.columnSchema.set(col, (_formatData$columnSch = {}, defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.CALC_WIDTH, undefined), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.RESIZE_WIDTH, undefined), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_MIN_WIDTH, resolveMinWidth(col)), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.LISTENERS, new Map()), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.WIDTH, col.width), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.IS_HIDDEN, isColumnHidden(formatData.settings.fields, col, formatData.settings.checked)), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_SORT_TYPE, type), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_SORT_FN, fn), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_FILTER_FN, undefined), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_FILTER_SCOPE, undefined), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_SORT_SCOPE, scope), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_SORT_ACTIVE, active), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_IS_DRAG, false), defineProperty_defineProperty(_formatData$columnSch, COLUMN_ATTRIBUTE.COL_SPAN, {
           skipCol: skipCol,
           skipColumnNum: skipColumnNum,
           skipColLen: skipColLen
@@ -3381,10 +3414,10 @@ function use_attributes_objectSpread(target) { for (var i = 1; i < arguments.len
    * @returns
    */
   var getColumnOrderWidth = function getColumnOrderWidth(col) {
-    var _formatData$columnSch4, _ref2, _target$orders$;
+    var _formatData$columnSch4, _ref5, _target$orders$;
     var orders = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ORDER_LIST;
     var target = (_formatData$columnSch4 = formatData.columnSchema.get(col)) !== null && _formatData$columnSch4 !== void 0 ? _formatData$columnSch4 : {};
-    return (_ref2 = (_target$orders$ = target[orders[0]]) !== null && _target$orders$ !== void 0 ? _target$orders$ : target[orders[1]]) !== null && _ref2 !== void 0 ? _ref2 : target[orders[2]];
+    return (_ref5 = (_target$orders$ = target[orders[0]]) !== null && _target$orders$ !== void 0 ? _target$orders$ : target[orders[1]]) !== null && _ref5 !== void 0 ? _ref5 : target[orders[2]];
   };
   /**
    * 指定列是否展示状态
@@ -3587,8 +3620,8 @@ function use_attributes_objectSpread(target) { for (var i = 1; i < arguments.len
   var resolveColumnWidth = function resolveColumnWidth(root) {
     var autoWidth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : COL_MIN_WIDTH;
     var offsetWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    var _ref3 = root.getBoundingClientRect() || {},
-      width = _ref3.width;
+    var _ref6 = root.getBoundingClientRect() || {},
+      width = _ref6.width;
     var availableWidth = width - offsetWidth;
     // 可用来平均的宽度
     var avgWidth = availableWidth;
@@ -3715,6 +3748,7 @@ function use_attributes_objectSpread(target) { for (var i = 1; i < arguments.len
     sortData: sortData,
     isCheckedAll: isCheckedAll,
     hasCheckedRow: hasCheckedRow,
+    updateSettings: updateSettings,
     pageData: pageData,
     localPagination: localPagination,
     formatData: formatData
@@ -4962,8 +4996,7 @@ function settings_isSlot(s) {
   name: 'Settings',
   props: {
     settings: ITableSettings,
-    columns: external_shared_namespaceObject.PropTypes.arrayOf(IColumnType).def([]),
-    rowHeight: RowHeightFunctionNumberType.def(LINE_HEIGHT)
+    columns: external_shared_namespaceObject.PropTypes.arrayOf(IColumnType).def([])
   },
   emits: ['change'],
   setup: function setup(props, _ref) {
@@ -4988,7 +5021,7 @@ function settings_isSlot(s) {
           }),
           checked: [],
           limit: 0,
-          size: SETTING_SIZE.small,
+          size: 'small',
           sizeList: defaultSizeList,
           showLineHeight: true
         };
@@ -4996,7 +5029,7 @@ function settings_isSlot(s) {
       return props.settings;
     });
     var activeSize = (0,external_vue_namespaceObject.ref)(localSettings.value.size || 'small');
-    var activeHeight = (0,external_vue_namespaceObject.ref)(props.rowHeight);
+    var activeHeight = (0,external_vue_namespaceObject.ref)(SETTING_SIZE.small);
     var checkedFields = (0,external_vue_namespaceObject.ref)(localSettings.value.checked || []);
     var className = resolveClassName('table-settings');
     var theme = "light ".concat(className);
@@ -5313,10 +5346,9 @@ function use_render_isSlot(s) {
         size = arg.size,
         height = arg.height,
         fields = arg.fields;
-      tableResp.formatData.settings.size = size;
-      tableResp.formatData.settings.height = height;
+      tableResp.updateSettings(arg);
+      tableResp.setColumnAttributeBySettings(props.settings, checked);
       if (checked.length) {
-        tableResp.setColumnAttributeBySettings(props.settings, checked);
         (0,external_vue_namespaceObject.nextTick)(function () {
           resetTableHeight(root.value);
         });
@@ -5332,7 +5364,6 @@ function use_render_isSlot(s) {
       "class": "table-head-settings",
       "settings": props.settings,
       "columns": columns.value,
-      "rowHeight": props.rowHeight,
       "onChange": handleSettingsChanged
     }, {
       "default": function _default() {
@@ -6148,6 +6179,18 @@ function table_objectSpread(target) { for (var i = 1; i < arguments.length; i++)
         resetTableHeight(root.value);
       });
     });
+    (0,external_vue_namespaceObject.watch)(function () {
+      return [props.settings];
+    }, function () {
+      tableSchema.updateSettings(props.settings);
+    }, {
+      deep: true
+    });
+    (0,external_vue_namespaceObject.watch)(function () {
+      return [props.rowHeight];
+    }, function () {
+      tableSchema.updateSettings(undefined, props.rowHeight);
+    });
     var handleScrollChanged = function handleScrollChanged(args) {
       var _tableSchema$formatDa;
       var preBottom = (_tableSchema$formatDa = tableSchema.formatData.layout.bottom) !== null && _tableSchema$formatDa !== void 0 ? _tableSchema$formatDa : 0;

package/lib/table/plugins/settings.d.ts

@@ -3,21 +3,14 @@ declare const _default: import("vue").DefineComponent<{
     columns: import("vue-types").VueTypeDef<import("../props").Column[]> & {
         default: () => import("../props").Column[];
     };
-    rowHeight: import("vue-types").VueTypeDef<import("../props").RowHeightFunctionNumber> & {
-        default: import("../props").RowHeightFunctionNumber;
-    };
 }, () => "" | JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "change"[], "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     settings: import("vue-types").VueTypeDef<import("../props").ISettingPropType>;
     columns: import("vue-types").VueTypeDef<import("../props").Column[]> & {
         default: () => import("../props").Column[];
     };
-    rowHeight: import("vue-types").VueTypeDef<import("../props").RowHeightFunctionNumber> & {
-        default: import("../props").RowHeightFunctionNumber;
-    };
 }>> & {
     onChange?: (...args: any[]) => any;
 }, {
     columns: import("../props").Column[];
-    rowHeight: import("../props").RowHeightFunctionNumber;
 }, {}>;
 export default _default;

package/lib/table/use-attributes.d.ts

@@ -1,5 +1,5 @@
 import { IEmptyObject } from './const';
-import { Column, Settings, SortScope, TablePropTypes } from './props';
+import { Column, Field, Settings, SortScope, TablePropTypes } from './props';
 export type ITableFormatData = {
     data: any[];
     dataSchema: WeakMap<object, any>;
@@ -8,6 +8,8 @@ export type ITableFormatData = {
     settings: {
         size: string;
         height: number;
+        fields: Field[];
+        checked: string[];
     };
     layout: {
         bottom: number;
@@ -47,6 +49,7 @@ export type ITableResponse = {
     hasCheckedRow: () => boolean;
     setRowSelectionAll: (val: boolean) => void;
     setRowIndeterminate: () => void;
+    updateSettings: (settings?: Settings, rowHeight?: number) => void;
     pageData: any[];
     localPagination: any;
     formatData: ITableFormatData;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bkui-vue",
-  "version": "0.0.2-beta.112",
+  "version": "0.0.2-beta.114",
   "workspaces": {
     "packages": [
       "packages/!(**.bak)*",