vxe-table 4.1.5 → 4.1.6

package/package.json

@@ -1,13 +1,11 @@
 {
   "name": "vxe-table",
-  "version": "4.1.5",
+  "version": "4.1.6",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...",
   "scripts": {
     "serve": "vue-cli-service serve",
     "lint": "vue-cli-service lint",
-    "build": "npm run build:examples & npm run build:docs",
-    "build:examples": "vue-cli-service build",
-    "build:docs": "gulp update_docs",
+    "build": "vue-cli-service build",
     "lib:modules": "gulp build",
     "lib:pack": "vue-cli-service build --target lib --name index --dest lib_temp index.ts",
     "lib": "npm run lib:pack && npm run lib:modules",
@@ -29,9 +27,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "devDependencies": {
-    "@types/qrcode": "^1.4.1",
     "@types/resize-observer-browser": "^0.1.6",
-    "@types/sortablejs": "^1.10.7",
     "@typescript-eslint/eslint-plugin": "^4.18.0",
     "@typescript-eslint/parser": "^4.18.0",
     "@vue/cli-plugin-babel": "~4.5.0",
@@ -43,18 +39,13 @@
     "@vue/compiler-sfc": "^3.2.18",
     "@vue/eslint-config-standard": "^5.1.2",
     "@vue/eslint-config-typescript": "^7.0.0",
-    "ant-design-vue": "^2.2.8",
     "core-js": "^3.6.5",
-    "dayjs": "^1.10.7",
-    "element-plus": "^1.1.0-beta.24",
     "eslint": "^6.7.2",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.0",
     "eslint-plugin-vue": "^7.0.0",
-    "exceljs": "^4.3.0",
-    "font-awesome": "^4.7.0",
     "gulp": "^4.0.2",
     "gulp-autoprefixer": "^6.1.0",
     "gulp-babel": "^8.0.0",
@@ -67,29 +58,15 @@
     "gulp-sourcemaps": "^2.6.5",
     "gulp-typescript": "^5.0.1",
     "gulp-uglify": "^3.0.2",
-    "highlight.js": "^11.2.0",
-    "jsbarcode": "^3.11.0",
-    "jspdf": "^2.4.0",
     "node-sass": "^6.0.1",
-    "qrcode": "^1.4.4",
     "sass-loader": "^10.0.5",
-    "sortablejs": "^1.14.0",
     "typescript": "~4.3.5",
     "vue": "^3.2.21",
     "vue-i18n": "^9.1.7",
     "vue-router": "^4.0.11",
     "vuex": "^4.0.2",
-    "vxe-table-plugin-antd": "^3.0.5",
-    "vxe-table-plugin-element": "^3.0.5",
-    "vxe-table-plugin-export-pdf": "^3.0.2",
-    "vxe-table-plugin-export-xlsx": "^3.0.3",
-    "vxe-table-plugin-menus": "^3.0.6",
-    "vxe-table-plugin-renderer": "^3.0.2",
-    "vxe-table-plugin-shortcut-key": "^3.0.2",
     "xe-ajax": "^4.0.5",
-    "xe-clipboard": "^1.10.1",
-    "xe-utils": "^3.4.0",
-    "xlsx": "^0.17.2"
+    "xe-utils": "^3.4.0"
   },
   "peerDependencies": {
     "vue": "^3.2.2",

package/packages/form/src/form.ts

@@ -395,7 +395,7 @@ export default defineComponent({
             callback()
           }
         }).catch(() => {
-          return new Promise<void>((resolve, reject) => {
+          return new Promise<void>((resolve) => {
             showErrTime = window.setTimeout(() => {
               itemList.forEach((item) => {
                 if (item.errRule) {
@@ -412,7 +412,7 @@ export default defineComponent({
               callback(validRest)
               resolve()
             } else {
-              reject(validRest)
+              resolve(validRest)
             }
           })
         })

package/packages/table/src/table.ts

@@ -3086,6 +3086,16 @@ export default defineComponent({
         const treeOpts = computeTreeOpts.value
         const reserveSelection: any[] = []
         if (checkboxOpts.reserve) {
+          const afterFullIdMaps: { [key: string]: number } = {}
+          if (treeConfig) {
+            XEUtils.eachTree(afterFullData, row => {
+              afterFullIdMaps[getRowid($xetable, row)] = 1
+            }, treeOpts)
+          } else {
+            afterFullData.forEach(row => {
+              afterFullIdMaps[getRowid($xetable, row)] = 1
+            })
+          }
           XEUtils.each(checkboxReserveRowMap, (oldRow, oldRowid) => {
             if (oldRow) {
               if (isFull) {
@@ -3093,14 +3103,8 @@ export default defineComponent({
                   reserveSelection.push(oldRow)
                 }
               } else {
-                if (treeConfig) {
-                  if (!XEUtils.findTree(afterFullData, row => getRowid($xetable, row) === oldRowid, treeOpts)) {
-                    reserveSelection.push(oldRow)
-                  }
-                } else {
-                  if (!afterFullData.some(row => getRowid($xetable, row) === oldRowid)) {
-                    reserveSelection.push(oldRow)
-                  }
+                if (!afterFullIdMaps[oldRowid]) {
+                  reserveSelection.push(oldRow)
                 }
               }
             }

package/packages/v-x-e-table/src/conf.ts

@@ -13,6 +13,7 @@ const GlobalConfig: VXETableGlobalConfig = {
     showHeader: true,
     animat: true,
     delayHover: 250,
+    autoResize: true,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,
@@ -20,7 +21,6 @@ const GlobalConfig: VXETableGlobalConfig = {
     // resizeInterval: 500,
     // size: null,
     // zIndex: null,
-    // autoResize: false,
     // stripe: false,
     // border: false,
     // round: false,

package/packages/v-x-e-table/src/renderer.ts

@@ -685,7 +685,7 @@ export const renderer: VxeGlobalRenderer = {
     XEUtils.each(opts, (options, name) => renderer.add(name, options))
     return renderer
   },
-  get (name) {
+  get (name: string) {
     return renderMap[name] || null
   },
   add (name, options) {

package/packages/validator/src/hook.ts

@@ -149,21 +149,21 @@ const validatorHook: VxeGlobalHooksHandles.HookOptions = {
           const ruleProps = Object.keys(validRest)
           return nextTick().then(() => {
             if (ruleProps.length) {
-              return Promise.reject(validRest[ruleProps[0]][0])
+              return validRest[ruleProps[0]][0]
             }
             if (cb) {
               cb()
             }
           })
         }).catch(firstErrParams => {
-          return new Promise<void>((resolve, reject) => {
+          return new Promise<void>((resolve) => {
             const finish = () => {
               nextTick(() => {
                 if (cb) {
                   cb(validRest)
                   resolve()
                 } else {
-                  reject(validRest)
+                  resolve(validRest)
                 }
               })
             }

package/types/v-x-e-table/renderer.d.ts

@@ -17,6 +17,8 @@ export interface DefineRendererOption<T> {
   filterRemoteMethod?(params: VxeGlobalRendererHandles.FilterRemoteMethod): boolean;
   filterResetMethod?(params: VxeGlobalRendererHandles.FilterResetMethodParams): void;
   filterRecoverMethod?(params: VxeGlobalRendererHandles.FilterRecoverMethodParams): void;
+  // 默认行为
+  defaultFilterMethod?(params: VxeGlobalRendererHandles.FilterMethodParams): boolean;
 
   // 单元格渲染
   renderHeader?(renderOpts: VxeGlobalRendererHandles.RenderHeaderOptions, params: VxeGlobalRendererHandles.RenderHeaderParams): T;
@@ -197,7 +199,7 @@ export namespace VxeGlobalRendererHandles {
     /**
      * 渲染器名称
      */
-    name: string;
+    name?: string;
     /**
      * 目标组件渲染的参数
      */
@@ -246,7 +248,7 @@ export interface VxeGlobalRenderer {
   mixin(options: {
     [name: string]: RendererOptions;
   }): VxeGlobalRenderer;
-  get(name: string): DefineRendererOption<VxeGlobalRendererHandles.RenderResult>;
+  get(name: string | null | undefined): DefineRendererOption<VxeGlobalRendererHandles.RenderResult>;
   add(name: string, options: RendererOptions): VxeGlobalRenderer;
   delete(name: string): void;
 }