bkui-vue 1.0.3-beta.60.scrollbar.5 → 1.0.3-beta.61.dialog.1

package/lib/sideslider/sideslider.css

@@ -1,19 +1,13 @@
-.bk-sideslider {
-  position: fixed;
-  top: 0;
+.bk-sideslider.is-position-right .bk-modal-wrapper {
   right: 0;
-  bottom: 0;
+}
+.bk-sideslider.is-position-left .bk-modal-wrapper {
   left: 0;
 }
 .bk-sideslider .bk-modal-wrapper {
-  position: absolute;
+  position: fixed;
   top: 0;
   bottom: 0;
-  left: auto;
-  transform: initial;
-}
-.bk-sideslider .bk-modal-wrapper.scroll-able .bk-modal-content {
-  overflow: auto;
 }
 .bk-sideslider .bk-modal-footer.is-fixed .bk-sideslider-footer {
   height: 54px;
@@ -79,11 +73,6 @@
   width: 100%;
   padding: 0 0 0 46px;
 }
-.bk-sideslider-content {
-  padding-right: 24px;
-  padding-left: 24px;
-  overflow-y: scroll;
-}
 .bk-sideslider-footer {
   display: flex;
   width: 100%;
@@ -93,35 +82,3 @@
   background: #fff;
   align-items: center;
 }
-/* fade-center */
-/* slide过渡动画 */
-.slide-enter-active,
-.slide-leave-active,
-.bk-modal-body {
-  transform: translateX(0);
-  transition: transform 0.25s;
-}
-.slide-enter-active {
-  animation: slider-fade-in 0.25s;
-}
-.slide-leave-active {
-  animation: slider-fade-in 0.25s reverse;
-}
-.slide-enter-from.left,
-.slide-leave-to.left {
-  transform: translateX(-100%);
-  transition: transform 0.25s;
-}
-.slide-enter-from.right,
-.slide-leave-to.right {
-  transform: translateX(100%);
-  transition: transform 0.25s;
-}
-@keyframes slider-fade-in {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}

package/lib/sideslider/sideslider.d.ts

@@ -1,4 +1,9 @@
 declare const _default: import("vue").DefineComponent<{
+    title: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
+    } & {
+        default: string;
+    };
     direction: {
         type: StringConstructor;
         default: string;
@@ -9,18 +14,8 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
-    width: import("vue-types").VueTypeDef<string | number> & {
-        default: string | number;
-    };
-    height: import("vue-types").VueTypeDef<string | number> & {
-        default: string | number;
-    };
-    extCls: (import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    }) | (import("vue-types").VueTypeValidableDef<unknown[]> & {
-        default: () => unknown[];
-    });
-    scrollable: import("vue-types").VueTypeValidableDef<boolean> & {
+    width: import("vue-types").VueTypeDef<string | number>;
+    fullscreen: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
         default: boolean;
@@ -40,17 +35,6 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
-    fullscreen: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
-    size: import("vue-types").VueTypeDef<"small" | "medium" | "large" | "normal">;
-    draggable: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
     quickClose: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -60,14 +44,6 @@ declare const _default: import("vue").DefineComponent<{
         default: string | boolean | (() => HTMLElement);
     };
     zIndex: import("vue-types").VueTypeDef<string | number>;
-    maxHeight: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    };
-    title: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    } & {
-        default: string;
-    };
     animateType: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     } & {
@@ -77,30 +53,18 @@ declare const _default: import("vue").DefineComponent<{
         default: "show" | "if";
     };
     beforeClose: import("vue-types").VueTypeDef<unknown>;
-    dialogType: import("vue-types").VueTypeDef<"show" | "process" | "operation" | "confirm">;
-    multiInstance: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
-    infoType: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary">;
-    bodyClass: (import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    }) | (import("vue-types").VueTypeValidableDef<unknown[]> & {
-        default: () => unknown[];
-    });
     left: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
     top: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
-    hiddenDelay: import("vue-types").VueTypeValidableDef<number> & {
-        default: number;
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("hidden" | "shown" | "closed" | "update:isShow" | "animation-end")[], "hidden" | "shown" | "closed" | "update:isShow" | "animation-end", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    title: import("vue-types").VueTypeValidableDef<string> & {
+        default: string;
     } & {
-        default: number;
+        default: string;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("hidden" | "shown" | "closed" | "update:isShow" | "animation-end")[], "hidden" | "shown" | "closed" | "update:isShow" | "animation-end", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     direction: {
         type: StringConstructor;
         default: string;
@@ -111,18 +75,8 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
-    width: import("vue-types").VueTypeDef<string | number> & {
-        default: string | number;
-    };
-    height: import("vue-types").VueTypeDef<string | number> & {
-        default: string | number;
-    };
-    extCls: (import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    }) | (import("vue-types").VueTypeValidableDef<unknown[]> & {
-        default: () => unknown[];
-    });
-    scrollable: import("vue-types").VueTypeValidableDef<boolean> & {
+    width: import("vue-types").VueTypeDef<string | number>;
+    fullscreen: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
         default: boolean;
@@ -142,17 +96,6 @@ declare const _default: import("vue").DefineComponent<{
     } & {
         default: boolean;
     };
-    fullscreen: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
-    size: import("vue-types").VueTypeDef<"small" | "medium" | "large" | "normal">;
-    draggable: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
     quickClose: import("vue-types").VueTypeValidableDef<boolean> & {
         default: boolean;
     } & {
@@ -162,14 +105,6 @@ declare const _default: import("vue").DefineComponent<{
         default: string | boolean | (() => HTMLElement);
     };
     zIndex: import("vue-types").VueTypeDef<string | number>;
-    maxHeight: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    };
-    title: import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    } & {
-        default: string;
-    };
     animateType: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     } & {
@@ -179,29 +114,12 @@ declare const _default: import("vue").DefineComponent<{
         default: "show" | "if";
     };
     beforeClose: import("vue-types").VueTypeDef<unknown>;
-    dialogType: import("vue-types").VueTypeDef<"show" | "process" | "operation" | "confirm">;
-    multiInstance: import("vue-types").VueTypeValidableDef<boolean> & {
-        default: boolean;
-    } & {
-        default: boolean;
-    };
-    infoType: import("vue-types").VueTypeDef<"success" | "warning" | "danger" | "primary">;
-    bodyClass: (import("vue-types").VueTypeValidableDef<string> & {
-        default: string;
-    }) | (import("vue-types").VueTypeValidableDef<unknown[]> & {
-        default: () => unknown[];
-    });
     left: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
     top: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
-    hiddenDelay: import("vue-types").VueTypeValidableDef<number> & {
-        default: number;
-    } & {
-        default: number;
-    };
 }>> & {
     onHidden?: (...args: any[]) => any;
     onShown?: (...args: any[]) => any;
@@ -210,26 +128,17 @@ declare const _default: import("vue").DefineComponent<{
     "onAnimation-end"?: (...args: any[]) => any;
 }, {
     title: string;
-    width: string | number;
-    height: string | number;
-    maxHeight: string;
-    extCls: string | unknown[];
     top: string;
     left: string;
     isShow: boolean;
-    draggable: boolean;
     transfer: string | boolean | HTMLElement;
     direction: string;
     renderDirective: "show" | "if";
-    scrollable: boolean;
+    fullscreen: boolean;
     showMask: boolean;
     closeIcon: boolean;
     escClose: boolean;
-    fullscreen: boolean;
     quickClose: boolean;
     animateType: string;
-    multiInstance: boolean;
-    bodyClass: string | unknown[];
-    hiddenDelay: number;
 }, {}>;
 export default _default;

package/lib/sideslider/sideslider.less

@@ -1,30 +1,29 @@
 @import '../styles/themes/themes.less';
 
 .@{bk-prefix}-sideslider {
-  position: fixed;
-  top: 0;
-  right: 0;
-  bottom: 0;
-  left: 0;
+  &.is-position-right {
+    .@{bk-prefix}-modal-wrapper {
+      right: 0;
+    }
+  }
+
+  &.is-position-left {
+    .@{bk-prefix}-modal-wrapper {
+      left: 0;
+    }
+  }
 
   .@{bk-prefix}-modal-wrapper {
-    position: absolute;
+    position: fixed;
     top: 0;
     bottom: 0;
-    left: auto;
-    transform: initial;
-
-    &.scroll-able {
-      .@{bk-prefix}-modal-content {
-        overflow: auto;
-      }
-    }
   }
+
   .@{bk-prefix}-modal-footer {
     &.is-fixed {
       .@{bk-prefix}-sideslider-footer {
         height: 54px;
-        margin: 0;;
+        margin: 0;
         border-top: 1px solid transparent;
         box-shadow: rgb(0 0 0 / 6%) 0 -2px 4px 0;
       }
@@ -98,12 +97,6 @@
   }
 }
 
-.@{bk-prefix}-sideslider-content {
-  padding-right: 24px;
-  padding-left: 24px;
-  overflow-y: scroll;
-}
-
 .@{bk-prefix}-sideslider-footer {
   display: flex;
   width: 100%;
@@ -113,47 +106,3 @@
   background: #fff;
   align-items: center;
 }
-
-/* fade-center */
-
-/* slide过渡动画 */
-.slide-enter-active,
-.slide-leave-active,
-.@{bk-prefix}-modal-body {
-  transform: translateX(0);
-  transition: transform .25s;
-}
-
-.slide-enter-active {
-  animation: slider-fade-in .25s;
-}
-
-.slide-leave-active {
-  animation: slider-fade-in .25s reverse;
-}
-
-.slide-enter-from,
-.slide-leave-to {
-  &.left {
-    transform: translateX(-100%);
-    transition: transform .25s;
-  }
-
-  &.right {
-    transform: translateX(100%);
-    transition: transform .25s;
-  }
-}
-
-@keyframes slider-fade-in {
-  0% {
-    opacity: 0;
-  }
-
-  100% {
-    opacity: 1;
-  }
-}
-
-
-

package/lib/sideslider/sideslider.variable.css

@@ -127,22 +127,16 @@
   --select-active-color: #e1ecff;
   --select-hover-color: #f5f7fa;
 }
-.bk-sideslider {
-  position: fixed;
-  top: 0;
+.bk-sideslider.is-position-right .bk-modal-wrapper {
   right: 0;
-  bottom: 0;
+}
+.bk-sideslider.is-position-left .bk-modal-wrapper {
   left: 0;
 }
 .bk-sideslider .bk-modal-wrapper {
-  position: absolute;
+  position: fixed;
   top: 0;
   bottom: 0;
-  left: auto;
-  transform: initial;
-}
-.bk-sideslider .bk-modal-wrapper.scroll-able .bk-modal-content {
-  overflow: auto;
 }
 .bk-sideslider .bk-modal-footer.is-fixed .bk-sideslider-footer {
   height: 54px;
@@ -208,11 +202,6 @@
   width: 100%;
   padding: 0 0 0 46px;
 }
-.bk-sideslider-content {
-  padding-right: 24px;
-  padding-left: 24px;
-  overflow-y: scroll;
-}
 .bk-sideslider-footer {
   display: flex;
   width: 100%;
@@ -222,35 +211,3 @@
   background: #fff;
   align-items: center;
 }
-/* fade-center */
-/* slide过渡动画 */
-.slide-enter-active,
-.slide-leave-active,
-.bk-modal-body {
-  transform: translateX(0);
-  transition: transform 0.25s;
-}
-.slide-enter-active {
-  animation: slider-fade-in 0.25s;
-}
-.slide-leave-active {
-  animation: slider-fade-in 0.25s reverse;
-}
-.slide-enter-from.left,
-.slide-leave-to.left {
-  transform: translateX(-100%);
-  transition: transform 0.25s;
-}
-.slide-enter-from.right,
-.slide-leave-to.right {
-  transform: translateX(100%);
-  transition: transform 0.25s;
-}
-@keyframes slider-fade-in {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}

package/lib/table/index.js

@@ -3196,6 +3196,7 @@ const loading_less_namespaceObject = loading_less_x({  });
     return refScrollLoading.value !== null && (typeof refScrollLoading.value === 'boolean' && refScrollLoading.value || typeof_typeof(refScrollLoading.value) === 'object');
   });
   var renderScrollLoading = function renderScrollLoading() {
+    var _ctx$slots$fixedBotto3, _ctx$slots$fixedBotto4, _ctx$slots2;
     if (isRender.value) {
       var _ctx$slots$fixedBotto, _ctx$slots$fixedBotto2, _ctx$slots;
       var _getLoadingOption = getLoadingOption(),
@@ -3214,6 +3215,7 @@ const loading_less_namespaceObject = loading_less_x({  });
         indicator: indicator
       }, null);
     }
+    return (_ctx$slots$fixedBotto3 = (_ctx$slots$fixedBotto4 = (_ctx$slots2 = ctx.slots).fixedBottom) === null || _ctx$slots$fixedBotto4 === void 0 ? void 0 : _ctx$slots$fixedBotto4.call(_ctx$slots2)) !== null && _ctx$slots$fixedBotto3 !== void 0 ? _ctx$slots$fixedBotto3 : null;
   };
   return {
     renderScrollLoading: renderScrollLoading
@@ -3301,9 +3303,9 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
     if (!props.pagination) {
       return;
     }
-    localPagination.value = props.remotePagination ? pagination : use_pagination_objectSpread(use_pagination_objectSpread({}, pagination), {}, {
+    localPagination.value = props.remotePagination ? pagination : use_pagination_objectSpread({
       count: indexData.length
-    });
+    }, pagination);
   };
   /**
    * 重置当前分页开始位置 & 结束位置
@@ -3368,35 +3370,35 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
     }
     pageData.length = 0;
     pageData.push.apply(pageData, _toConsumableArray(sourceData.slice(startIndex.value, endIndex.value)));
-    filter(pageData, filterFn);
+    if (Array.isArray(filterFn)) {
+      multiFilter(filterFn, pageData);
+    } else {
+      filter(pageData, filterFn);
+    }
     sort(pageData, sortFn, column, type, sortScope);
     resolveLocalPagination();
   };
   var resolvePageDataBySortList = function resolvePageDataBySortList(multiCol) {
     resolvePageData(null, null, null, null, null, multiCol);
   };
-  var multiFilter = function multiFilter(filterFnList) {
-    var sourceData = indexData.slice();
+  var getCurrentPageData = function getCurrentPageData() {
+    return indexData.slice(startIndex.value, endIndex.value);
+  };
+  var multiFilter = function multiFilter(filterFnList, origin) {
+    var sourceData = (origin !== null && origin !== void 0 ? origin : indexData).slice();
     var target = filterFnList.reduce(function (result, fn) {
       return filter(result, fn);
     }, sourceData);
     pageData.length = 0;
     pageData.push.apply(pageData, _toConsumableArray(getRawData(target)));
   };
-  var handlePaginationChange = function handlePaginationChange() {
+  var handlePaginationChange = function handlePaginationChange(filterFn, sortFn) {
     pagination = resolvePaginationOption(props.pagination, pagination);
     resolveLocalPagination();
     resetStartEndIndex();
-    resolvePageData();
+    resolvePageData(filterFn, sortFn);
   };
   handlePaginationChange();
-  (0,external_vue_namespaceObject.watch)(function () {
-    return [props.pagination];
-  }, function () {
-    handlePaginationChange();
-  }, {
-    deep: true
-  });
   return {
     pageData: pageData,
     indexData: indexData,
@@ -3404,7 +3406,9 @@ var resolvePaginationOption = function resolvePaginationOption(propPagination, d
     resolvePageData: resolvePageData,
     resolveIndexData: resolveIndexData,
     resolvePageDataBySortList: resolvePageDataBySortList,
+    handlePaginationChange: handlePaginationChange,
     resetStartEndIndex: resetStartEndIndex,
+    getCurrentPageData: getCurrentPageData,
     multiFilter: multiFilter,
     sort: sort
   };
@@ -3483,6 +3487,8 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
     localPagination = _usePagination.localPagination,
     resolvePageData = _usePagination.resolvePageData,
     resolvePageDataBySortList = _usePagination.resolvePageDataBySortList,
+    handlePaginationChange = _usePagination.handlePaginationChange,
+    getCurrentPageData = _usePagination.getCurrentPageData,
     multiFilter = _usePagination.multiFilter,
     sort = _usePagination.sort,
     resetStartEndIndex = _usePagination.resetStartEndIndex,
@@ -3605,13 +3611,15 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
   var getColumnFilterFn = function getColumnFilterFn(col) {
     return getColumnAttribute(col, COLUMN_ATTRIBUTE.COL_FILTER_FN);
   };
-  var filter = function filter() {
-    var filterFnList = formatData.columns.filter(function (col) {
+  var getFilterFnList = function getFilterFnList() {
+    return formatData.columns.filter(function (col) {
       return !isHiddenColumn(col) && typeof getColumnFilterFn(col) === 'function';
     }).map(function (col) {
       return getColumnFilterFn(col);
     });
-    multiFilter(filterFnList);
+  };
+  var filter = function filter() {
+    multiFilter(getFilterFnList(), getCurrentPageData());
   };
   /**
    * 按照指定列排序
@@ -4072,6 +4080,13 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
   var setIndexData = function setIndexData() {
     return resolveIndexData();
   };
+  (0,external_vue_namespaceObject.watch)(function () {
+    return [props.pagination];
+  }, function () {
+    handlePaginationChange(getFilterFnList());
+  }, {
+    deep: true
+  });
   return {
     formatColumns: formatColumns,
     formatDataSchema: formatDataSchema,
@@ -4109,7 +4124,8 @@ var tableSchemaResponse = function tableSchemaResponse(props) {
     pageData: pageData,
     localPagination: localPagination,
     formatData: formatData,
-    setIndexData: setIndexData
+    setIndexData: setIndexData,
+    getFilterFnList: getFilterFnList
   };
 };
 /* harmony default export */ const use_attributes = (tableSchemaResponse);
@@ -6827,17 +6843,12 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
       updateFixClass = _useFixedColumn.updateFixClass;
     var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
       resolveClassName = _usePrefix.resolveClassName;
-    // const styleRef = computed(() => ({
-    //   hasScrollY: hasScrollYRef.value,
-    // }));
     use_observer_resize(root, function () {
       (0,external_vue_namespaceObject.nextTick)(function () {
         resolveFixedColumns(tableOffsetRight.value);
       });
     });
-    var _useRender = use_render(props, ctx, tableSchema,
-      // styleRef,
-      head, root, resetTableHeight),
+    var _useRender = use_render(props, ctx, tableSchema, head, root, resetTableHeight),
       renderTableBodySchema = _useRender.renderTableBodySchema,
       renderTableFooter = _useRender.renderTableFooter,
       renderTableHeadSchema = _useRender.renderTableHeadSchema;
@@ -6859,13 +6870,12 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
       tableSchema.formatColumns(columns);
       resolveFixedColumns(tableOffsetRight.value);
       tableSchema.setIndexData().then(function () {
-        // tableSchema.formatDataSchema(props.data);
         tableSchema.resetStartEndIndex();
         if (isFirstLoad.value) {
           tableSchema.resolveByDefColumns();
           isFirstLoad.value = false;
         } else {
-          tableSchema.resolvePageData();
+          tableSchema.resolvePageData(tableSchema.getFilterFnList());
         }
         registerResizeEvent();
         (0,external_vue_namespaceObject.nextTick)(function () {
@@ -6992,8 +7002,7 @@ function table_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { va
           return renderTableBodySchema(scope.data);
         },
         afterSection: function afterSection() {
-          return [// <div class={fixedBottomBorder.value}></div>,
-          (0,external_vue_namespaceObject.createVNode)("div", {
+          return [(0,external_vue_namespaceObject.createVNode)("div", {
             "class": resizeColumnClass,
             "style": resizeColumnStyle.value
           }, null)];

package/lib/table/plugins/use-pagination.d.ts

@@ -14,8 +14,10 @@ declare const _default: (props: TablePropTypes) => {
     resolvePageData: (filterFn?: any, sortFn?: any, column?: Column, type?: string, sortScope?: any, multiCol?: any) => void;
     resolveIndexData: () => Promise<void>;
     resolvePageDataBySortList: (multiCol?: any) => void;
+    handlePaginationChange: (filterFn?: any, sortFn?: any) => void;
     resetStartEndIndex: () => void;
-    multiFilter: (filterFnList: ((row: any, index: any, data: any) => void)[]) => void;
+    getCurrentPageData: () => any[];
+    multiFilter: (filterFnList: ((row: any, index: any, data: any) => void)[], origin?: any) => void;
     sort: (sourceData: any[], sortFn: any, column: Column, type: string, sortScope: SortScope) => void;
 };
 export default _default;