xrk-components 2.0.0-beta.82 → 2.0.0-beta.84

package/lib/index.esm.js

@@ -73296,6 +73296,10 @@ var script$o = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$m
         var searchValue = ref('');
         // 父组件值发生改变时，同步selectValue
         watch(function () { return props.modelValue; }, function (newV) {
+            // 防止执行setOptionsData后，remoteSelected和model才有数据的异步情况
+            if (newV && !selectValue.value) {
+                setRemoteSelected(_options.value);
+            }
             selectValue.value = newV;
         });
         var getSelectOptions = function (options, selectValue) {
@@ -77165,7 +77169,6 @@ var __default__$1 = {
 };
 var script$1 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$1), { props: {
         requestNow: { type: Boolean, required: false, default: true },
-        reserveSelection: { type: Boolean, required: false },
         fix: { type: Boolean, required: false, default: true },
         getListAjax: { type: Function, required: true },
         searchConfig: { type: Object, required: true },
@@ -77243,17 +77246,18 @@ var script$1 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$1
             TableSelectionRows.value = [];
         };
         var handleSearch = function (searchValue) { return __awaiter(_this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         searchQuery.value = base.deepClone(searchValue);
                         initPageInfo(1);
-                        if (!props.reserveSelection) {
+                        if (!((_a = props.searchConfig) === null || _a === void 0 ? void 0 : _a.reserveSelection)) {
                             clearSelectionRows();
                         }
                         return [4 /*yield*/, (getList === null || getList === void 0 ? void 0 : getList(query.value))];
                     case 1:
-                        _a.sent();
+                        _b.sent();
                         tableToTop();
                         checkTableNeedScroll();
                         return [2 /*return*/];

package/lib/index.umd.js

@@ -73299,6 +73299,10 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           var searchValue = vue.ref('');
           // 父组件值发生改变时，同步selectValue
           vue.watch(function () { return props.modelValue; }, function (newV) {
+              // 防止执行setOptionsData后，remoteSelected和model才有数据的异步情况
+              if (newV && !selectValue.value) {
+                  setRemoteSelected(_options.value);
+              }
               selectValue.value = newV;
           });
           var getSelectOptions = function (options, selectValue) {
@@ -77168,7 +77172,6 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
   };
   var script$1 = /*#__PURE__*/ vue.defineComponent(__assign(__assign({}, __default__$1), { props: {
           requestNow: { type: Boolean, required: false, default: true },
-          reserveSelection: { type: Boolean, required: false },
           fix: { type: Boolean, required: false, default: true },
           getListAjax: { type: Function, required: true },
           searchConfig: { type: Object, required: true },
@@ -77246,17 +77249,18 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
               TableSelectionRows.value = [];
           };
           var handleSearch = function (searchValue) { return __awaiter(_this, void 0, void 0, function () {
-              return __generator(this, function (_a) {
-                  switch (_a.label) {
+              var _a;
+              return __generator(this, function (_b) {
+                  switch (_b.label) {
                       case 0:
                           searchQuery.value = xrkTools.base.deepClone(searchValue);
                           initPageInfo(1);
-                          if (!props.reserveSelection) {
+                          if (!((_a = props.searchConfig) === null || _a === void 0 ? void 0 : _a.reserveSelection)) {
                               clearSelectionRows();
                           }
                           return [4 /*yield*/, (getList === null || getList === void 0 ? void 0 : getList(query.value))];
                       case 1:
-                          _a.sent();
+                          _b.sent();
                           tableToTop();
                           checkTableNeedScroll();
                           return [2 /*return*/];

package/lib/packages/xrk/table/table.d.ts

@@ -4,10 +4,6 @@ declare const _default: import("vue").DefineComponent<{
         required: false;
         default: boolean;
     };
-    reserveSelection: {
-        type: BooleanConstructor;
-        required: false;
-    };
     fix: {
         type: BooleanConstructor;
         required: false;
@@ -37,10 +33,6 @@ declare const _default: import("vue").DefineComponent<{
         required: false;
         default: boolean;
     };
-    reserveSelection: {
-        type: BooleanConstructor;
-        required: false;
-    };
     fix: {
         type: BooleanConstructor;
         required: false;
@@ -64,7 +56,6 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>>, {
     requestNow: boolean;
-    reserveSelection: boolean;
     fix: boolean;
 }>;
 export default _default;

package/lib/packages/xrk/table/types/type.d.ts

@@ -22,11 +22,6 @@ export declare type XrkTableProps<S extends Record<string, any> = any, T extends
      * 是否固定高度 滚动表格
      */
     fix?: boolean;
-    /**
-     * 点击搜索是否重置选中项，默认false清空
-     * 由xrk-table维护
-     */
-    reserveSelection?: boolean;
     /**
      * 获取表格数据
      */
@@ -35,6 +30,11 @@ export declare type XrkTableProps<S extends Record<string, any> = any, T extends
      * 搜索项配置
      */
     searchConfig: {
+        /**
+         * 点击搜索是否重置选中项，默认false清空
+         * 由xrk-table维护
+         */
+        reserveSelection?: boolean;
         /**
          * 隐藏搜索项目
          */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xrk-components",
-  "version": "2.0.0-beta.82",
+  "version": "2.0.0-beta.84",
   "description": "",
   "main": "lib/index.esm.js",
   "typings": "lib/packages/index.d.ts",