bkui-vue 1.0.3-beta.17 → 1.0.3-beta.19

package/lib/info-box/index.js

@@ -561,6 +561,7 @@ var InfoBox = function InfoBox(config) {
   var modalFuncProps = (0,external_vue_namespaceObject.shallowRef)(config);
   var isShow = (0,external_vue_namespaceObject.ref)(modalFuncProps.value.isShow !== false);
   var app;
+  var dialogConfirm;
   var dialog = (0,external_vue_namespaceObject.defineComponent)({
     name: 'DialogConfirm',
     setup: function setup(_props, _ref) {
@@ -674,6 +675,7 @@ var InfoBox = function InfoBox(config) {
           return fn();
         });
         beforeHiddenFn.length = 0;
+        unmountApp();
         container.remove();
       };
       return function () {
@@ -696,9 +698,15 @@ var InfoBox = function InfoBox(config) {
   var beforeShow = function beforeShow() {
     if (!app) {
       document.body.append(container);
-      app = (0,external_vue_namespaceObject.createApp)(dialog).mount(container);
+      app = (0,external_vue_namespaceObject.createApp)(dialog);
+      dialogConfirm = app.mount(container);
     }
   };
+  var unmountApp = function unmountApp() {
+    var _app;
+    (_app = app) === null || _app === void 0 || _app.unmount();
+    app = null;
+  };
   if (isShow.value) {
     beforeShow();
   }
@@ -709,17 +717,16 @@ var InfoBox = function InfoBox(config) {
     },
     hide: function hide() {
       isShow.value = false;
+      unmountApp();
     },
     update: function update(config) {
-      var _app;
+      var _dialogConfirm;
       beforeShow();
-      (_app = app) === null || _app === void 0 || _app.update(config);
+      (_dialogConfirm = dialogConfirm) === null || _dialogConfirm === void 0 || _dialogConfirm.update(config);
     },
     destroy: function destroy() {
-      var _app2;
       container.remove();
-      (_app2 = app) === null || _app2 === void 0 || _app2.unmount();
-      app = null;
+      unmountApp();
     }
   };
 };

package/lib/modal/index.js

@@ -576,7 +576,7 @@ var propsMixin = {
   // 是否允许点击遮罩关闭弹窗
   quickClose: shared_namespaceObject.PropTypes.bool.def(true),
   // 是否显示在body内（即与id#app同级
-  transfer: shared_namespaceObject.PropTypes.oneOfType([Boolean, String, HTMLElement]).def(false),
+  transfer: shared_namespaceObject.PropTypes.oneOfType([Boolean, String, HTMLElement]).def(true),
   // 弹出层z-index，实际显示的值会自动+1。为了抱证在遮罩上正常显示
   zIndex: shared_namespaceObject.PropTypes.oneOfType([String, Number]),
   // 内容区最大高度

package/lib/plugin-popover/index.js

@@ -3087,6 +3087,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
     var delay = resolvePopoverDelay()[0];
     // 设置settimeout避免hidePopover导致显示问题
     popShowTimerId = setTimeout(function () {
+      // if (popHideTimerId) {
+      //   clearTimeout(popHideTimerId);
+      // }
       if (!props.disabled) {
         localIsShow.value = true;
       }
@@ -3097,7 +3100,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
     popHideTimerId = setTimeout(function () {
       popShowTimerId && clearTimeout(popShowTimerId);
       localIsShow.value = false;
-    }, delay + 10);
+    }, delay);
   };
   var handlePopoverShow = function handlePopoverShow() {
     var _refContent$value2;

package/lib/popover/index.js

@@ -3090,6 +3090,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
     var delay = resolvePopoverDelay()[0];
     // 设置settimeout避免hidePopover导致显示问题
     popShowTimerId = setTimeout(function () {
+      // if (popHideTimerId) {
+      //   clearTimeout(popHideTimerId);
+      // }
       if (!props.disabled) {
         localIsShow.value = true;
       }
@@ -3100,7 +3103,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
     popHideTimerId = setTimeout(function () {
       popShowTimerId && clearTimeout(popShowTimerId);
       localIsShow.value = false;
-    }, delay + 10);
+    }, delay);
   };
   var handlePopoverShow = function handlePopoverShow() {
     var _refContent$value2;

package/lib/table/index.js

@@ -122,7 +122,7 @@ function defineProperty_defineProperty(obj, key, value) {
 ;// CONCATENATED MODULE: external "vue"
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
-const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createTextVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["isProxy"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isProxy, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["provide"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.provide, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch });
+const external_vue_namespaceObject = external_vue_x({ ["Fragment"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.Fragment, ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createTextVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["inject"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.inject, ["isProxy"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isProxy, ["isVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.isVNode, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["nextTick"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.nextTick, ["onBeforeUnmount"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onBeforeUnmount, ["onMounted"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.onMounted, ["provide"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.provide, ["reactive"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.reactive, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref, ["toRaw"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRaw, ["toRef"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.toRef, ["unref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.unref, ["watch"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watch, ["watchEffect"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.watchEffect });
 ;// CONCATENATED MODULE: ../../packages/table/src/const.ts
 
 /*
@@ -3362,7 +3362,7 @@ function use_attributes_objectSpread(e) { for (var r = 1; r < arguments.length;
 
 
 
-/* harmony default export */ const use_attributes = (function (props) {
+var tableSchemaResponse = function tableSchemaResponse(props) {
   var t = (0,config_provider_namespaceObject.useLocale)('table');
   var getDefaultSettings = function getDefaultSettings() {
     var _ref, _SETTING_SIZE$size;
@@ -4027,7 +4027,8 @@ function use_attributes_objectSpread(e) { for (var r = 1; r < arguments.length;
     formatData: formatData,
     setIndexData: setIndexData
   };
-});
+};
+/* harmony default export */ const use_attributes = (tableSchemaResponse);
 ;// CONCATENATED MODULE: ../../packages/table/src/use-column.ts
 
 /*
@@ -4873,7 +4874,7 @@ function _isSlot(s) {
       return resolvePropVal(item, ['id', 'field', 'type'], [item, index]);
     };
     var checkAll = (0,external_vue_namespaceObject.ref)(false);
-    var isShow = (0,external_vue_namespaceObject.ref)(false);
+    var refSetting = (0,external_vue_namespaceObject.ref)(null);
     var localSettings = (0,external_vue_namespaceObject.computed)(function () {
       var deafultSettings = {
         fields: props.columns.map(function (col) {
@@ -4886,6 +4887,7 @@ function _isSlot(s) {
         size: 'small',
         sizeList: defaultSizeList,
         showLineHeight: true,
+        extCls: '',
         trigger: 'manual'
       };
       if (typeof props.settings === 'boolean') {
@@ -4908,6 +4910,7 @@ function _isSlot(s) {
       checkedFields: localSettings.value.checked || []
     };
     var handleSaveClick = function handleSaveClick() {
+      var _refSetting$value;
       Object.assign(cachedValue, {
         checkAll: checkAll.value,
         activeSize: activeSize.value,
@@ -4920,17 +4923,21 @@ function _isSlot(s) {
         height: activeHeight.value,
         fields: (0,external_vue_namespaceObject.unref)(renderFields)
       });
-      isShow.value = false;
+      (_refSetting$value = refSetting.value) === null || _refSetting$value === void 0 || _refSetting$value.hide();
     };
     var handleCancelClick = function handleCancelClick() {
+      var _refSetting$value2;
       checkAll.value = cachedValue.checkAll;
       activeSize.value = cachedValue.activeSize;
       activeHeight.value = cachedValue.activeHeight;
       checkedFields.value = cachedValue.checkedFields;
-      isShow.value = false;
+      (_refSetting$value2 = refSetting.value) === null || _refSetting$value2 === void 0 || _refSetting$value2.hide();
     };
     var handleSettingClick = function handleSettingClick() {
-      isShow.value = true;
+      if (localSettings.value.trigger === 'manual') {
+        var _refSetting$value3;
+        (_refSetting$value3 = refSetting.value) === null || _refSetting$value3 === void 0 || _refSetting$value3.show();
+      }
     };
     var handleCheckAllClick = function handleCheckAllClick(e) {
       e.stopImmediatePropagation();
@@ -5025,9 +5032,10 @@ function _isSlot(s) {
       var _localSettings$value$2;
       return props.settings ? (0,external_vue_namespaceObject.createVNode)(popover_namespaceObject["default"], (0,external_vue_namespaceObject.mergeProps)({
         "trigger": (_localSettings$value$2 = localSettings.value.trigger) !== null && _localSettings$value$2 !== void 0 ? _localSettings$value$2 : 'manual',
-        "isShow": isShow.value,
         "placement": "bottom-end",
-        "arrow": true
+        "ref": refSetting,
+        "arrow": true,
+        "extCls": localSettings.value.extCls
       }, {
         theme: theme
       }), {
@@ -6759,12 +6767,10 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
       }
     };
     var isFirstLoad = (0,external_vue_namespaceObject.ref)(true);
-    // const tableWidth = ref(null);
-    (0,external_vue_namespaceObject.watch)(function () {
-      return [props.data, columns];
-    }, function () {
+    (0,external_vue_namespaceObject.watchEffect)(function () {
+      tableSchema.formatColumns(columns);
+      resolveFixedColumns(tableOffsetRight.value);
       tableSchema.setIndexData().then(function () {
-        tableSchema.formatColumns(columns);
         tableSchema.formatDataSchema(props.data);
         tableSchema.resetStartEndIndex();
         if (isFirstLoad.value) {
@@ -6776,7 +6782,6 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
         registerResizeEvent();
         (0,external_vue_namespaceObject.nextTick)(function () {
           updateOffsetRight();
-          resolveFixedColumns(tableOffsetRight.value);
           /**
            * 确保在所有数据渲染完毕再执行fix column计算
            */
@@ -6785,9 +6790,6 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
           });
         });
       });
-    }, {
-      immediate: true,
-      deep: true
     });
     (0,external_vue_namespaceObject.watch)(function () {
       return [props.height, props.maxHeight, props.minHeight];

package/lib/table/props.d.ts

@@ -104,6 +104,7 @@ export type Settings = {
     size?: string;
     sizeList?: SizeItem[];
     showLineHeight?: boolean;
+    extCls?: string;
     trigger: 'manual';
 };
 export type ISettingPropType = Settings | boolean;

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

@@ -1,5 +1,5 @@
 import { IEmptyObject } from './const';
-import { Column, Field, Settings, SortScope, TablePropTypes } from './props';
+import { Column, Field, Settings, TablePropTypes } from './props';
 export type ITableFormatData = {
     data: any[];
     dataSchema: WeakMap<object, any>;
@@ -18,46 +18,7 @@ export type ITableFormatData = {
         translateY: number;
     };
 };
-export type ITableResponse = {
-    setIndexData: () => Promise<void>;
-    formatColumns: (columns: Column[]) => void;
-    formatDataSchema: (data: any[]) => void;
-    setRowSelection: (row: any, isSelected: boolean) => void;
-    setRowExpand: (row: any, isExpand: boolean) => void;
-    setRowIndex: (row: any, index: number) => void;
-    setColumnAttribute: (col: Column, attrName: string, attrValue: ((...args: any[]) => boolean | number | void | string) | string | boolean | number) => void;
-    setColumnAttributeBySettings: (settings: Settings, checkedVal?: string[]) => void;
-    setAllColumnAttribute: (attrName: string, attrValue: ((...args: any[]) => boolean | number | void | string) | string | boolean | number) => void;
-    getColumnAttribute: (col: Column, attributeName: string) => string | boolean | Record<string, any>;
-    getColumnId: (col: Column) => string;
-    getColumnOrderWidth: (column: Column, orders?: string[]) => number;
-    isActiveColumn: (col: Column) => boolean;
-    isHiddenColumn: (col: Column) => boolean;
-    resolvePageData: (filterFn?: any, sortFn?: any, column?: Column, type?: string, sortScope?: SortScope) => void;
-    resolveByDefColumns: () => void;
-    resetStartEndIndex: () => void;
-    toggleRowSelection: (row: any) => void;
-    toggleAllSelection: (value?: boolean) => void;
-    setAllRowExpand: (value?: boolean) => void;
-    clearSelection: () => void;
-    clearColumnSort: (reset?: boolean) => void;
-    setColumnSortActive: (column: Column, active: boolean) => void;
-    getRowAttribute: (row: any | IEmptyObject, attrName: string) => any;
-    getRowSelection: () => any[];
-    resolveColumnWidth: (root: HTMLElement, autoWidth?: any, offsetWidth?: any) => void;
-    filter: () => void;
-    sortData: (column: Column) => void;
-    isCheckedAll: () => boolean;
-    hasCheckedRow: () => boolean;
-    setRowSelectionAll: (val: boolean) => void;
-    setRowIndeterminate: () => void;
-    updateSettings: (settings?: Settings, rowHeight?: number) => void;
-    changePageRowIndex: (sourceIndex: number, targetIndex: number) => void;
-    pageData: any[];
-    localPagination: any;
-    formatData: ITableFormatData;
-};
-declare const _default: (props: TablePropTypes) => {
+declare const tableSchemaResponse: (props: TablePropTypes) => {
     formatColumns: (columns: Column[]) => void;
     formatDataSchema: (data: any[]) => void;
     setRowSelection: (row: any, isSelected: boolean) => void;
@@ -96,4 +57,5 @@ declare const _default: (props: TablePropTypes) => {
     formatData: ITableFormatData;
     setIndexData: () => Promise<void>;
 };
-export default _default;
+export type ITableResponse = ReturnType<typeof tableSchemaResponse>;
+export default tableSchemaResponse;

package/package.json

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