xrk-components 2.0.0-beta.79 → 2.0.0-beta.80

package/lib/index.esm.js

@@ -73167,6 +73167,7 @@ var script$o = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$m
         filterMethod: { type: Function, required: false },
         maxlength: { type: Number, required: false, default: 50 },
         remoteMethod: { type: Function, required: false },
+        remoteSelected: { type: Array, required: false },
         notRemoteAutoFilter: { type: Boolean, required: false },
         loadingText: { type: String, required: false, default: '加载中' },
         noMatchText: { type: String, required: false, default: '暂无数据' },
@@ -73215,20 +73216,20 @@ var script$o = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$m
             }
         });
         var setOptionsData = function (val) { return __awaiter(_this, void 0, void 0, function () {
-            var res, data, error_1;
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var res, data_1, error_1;
+            var _a, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         if (!isFunction(props.remoteMethod)) return [3 /*break*/, 4];
-                        _b.label = 1;
+                        _c.label = 1;
                     case 1:
-                        _b.trys.push([1, 3, , 4]);
+                        _c.trys.push([1, 3, , 4]);
                         loading.value = true;
                         return [4 /*yield*/, ((_a = props.remoteMethod) === null || _a === void 0 ? void 0 : _a.call(props, val))];
                     case 2:
-                        res = _b.sent();
-                        data = check.isObject(res.data)
+                        res = _c.sent();
+                        data_1 = check.isObject(res.data)
                             ? Array.isArray(res.data.list)
                                 ? res.data.list
                                 : []
@@ -73236,17 +73237,29 @@ var script$o = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$m
                                 ? res.data
                                 : [];
                         loading.value = false;
+                        if (!val && ((_b = props.remoteSelected) === null || _b === void 0 ? void 0 : _b.length)) {
+                            props.remoteSelected.forEach(function (select) {
+                                var _a;
+                                if (select[props.labelKey] !== undefined &&
+                                    select[props.valueKey] !== undefined) {
+                                    // 不存在则添加
+                                    if (!data_1.some(function (item) { return item[props.valueKey] === select[props.valueKey]; })) {
+                                        data_1.push(__assign(__assign({}, select), (_a = {}, _a[props.labelKey] = select[props.labelKey], _a[props.valueKey] = select[props.valueKey], _a)));
+                                    }
+                                }
+                            });
+                        }
                         if (props.notRemoteAutoFilter) {
-                            _options.value = Array.isArray(data) ? data : [];
+                            _options.value = Array.isArray(data_1) ? data_1 : [];
                             return [2 /*return*/];
                         }
                         // 避免多次请求接口 接口响应先后顺序不一致导致数据错乱
-                        _options.value = Array.isArray(data)
-                            ? data.filter(function (i) { return !val || "".concat(i[props.labelKey || 'label']).indexOf(val) > -1; })
+                        _options.value = Array.isArray(data_1)
+                            ? data_1.filter(function (i) { return !val || "".concat(i[props.labelKey || 'label']).indexOf(val) > -1; })
                             : [];
                         return [3 /*break*/, 4];
                     case 3:
-                        error_1 = _b.sent();
+                        error_1 = _c.sent();
                         loading.value = false;
                         console.error(error_1);
                         return [3 /*break*/, 4];
@@ -73946,7 +73959,9 @@ var script$i = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$g
                 text: '重置',
                 show: true
             }); } },
-        otherComponents: { type: null, required: false }
+        otherComponents: { type: null, required: false },
+        syncQueryToSearch: { type: Boolean, required: false },
+        syncSearchToQuery: { type: Boolean, required: false }
     }, emits: ["search"], setup: function (__props, _a) {
         var _this = this;
         var expose = _a.expose, emits = _a.emit;
@@ -75010,8 +75025,10 @@ var useCreateModal = function (component, options, app) {
         appendToBody: false }, options));
     // inject 函数调用组件导致内部inject无法接收到，需要使用app.provide（全局）：  https://github.com/vuejs/core/issues/6220
     // context createApp需要use插件，内部才能使用插件\库相关API。可以直接修改上下文： https://github.com/vuejs/core/issues/2097
+    // main APP为_context， 组件上下文为appContext
+    // 如果不关联该项，会导致使用useCreateModal的函数组件内无法使用provide\route等需关联上下文的函数
     if (app) {
-        _instance.appContext = app._context; // 承接上下文，用于inject，调用层需要使用app.provide
+        _instance.appContext = app['_context'] || app['appContext']; // 承接上下文，用于inject，调用层需要使用app.provide
     }
     render$2(_instance, container);
     (_a = document.querySelector('body')) === null || _a === void 0 ? void 0 : _a.appendChild(container);
@@ -77135,6 +77152,7 @@ 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 },
@@ -77217,7 +77235,9 @@ var script$1 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$1
                     case 0:
                         searchQuery.value = base.deepClone(searchValue);
                         initPageInfo(1);
-                        clearSelectionRows();
+                        if (!props.reserveSelection) {
+                            clearSelectionRows();
+                        }
                         return [4 /*yield*/, (getList === null || getList === void 0 ? void 0 : getList(query.value))];
                     case 1:
                         _a.sent();
@@ -77340,15 +77360,17 @@ var script$1 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$1
                 (!__props.searchConfig.hide)
                     ? (openBlock(), createBlock(script$i, {
                         key: 1,
+                        style: { "margin-bottom": "16px" },
                         ref_key: "XrkSearchRef",
                         ref: XrkSearchRef,
                         columns: __props.searchConfig.searchColumns,
                         "search-btn": __props.searchConfig.searchBtn,
                         "reset-btn": __props.searchConfig.resetBtn,
                         "other-components": __props.searchConfig.otherComponents,
-                        onSearch: handleSearch,
-                        style: { "margin-bottom": "16px" }
-                    }, null, 8 /* PROPS */, ["columns", "search-btn", "reset-btn", "other-components"]))
+                        "sync-query-to-search": __props.searchConfig.syncQueryToSearch,
+                        "sync-search-to-query": __props.searchConfig.syncSearchToQuery,
+                        onSearch: handleSearch
+                    }, null, 8 /* PROPS */, ["columns", "search-btn", "reset-btn", "other-components", "sync-query-to-search", "sync-search-to-query"]))
                     : createCommentVNode("v-if", true),
                 (unref(slots).tableBefore)
                     ? renderSlot(_ctx.$slots, "tableBefore", {

package/lib/index.umd.js

@@ -73170,6 +73170,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           filterMethod: { type: Function, required: false },
           maxlength: { type: Number, required: false, default: 50 },
           remoteMethod: { type: Function, required: false },
+          remoteSelected: { type: Array, required: false },
           notRemoteAutoFilter: { type: Boolean, required: false },
           loadingText: { type: String, required: false, default: '加载中' },
           noMatchText: { type: String, required: false, default: '暂无数据' },
@@ -73218,20 +73219,20 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
               }
           });
           var setOptionsData = function (val) { return __awaiter(_this, void 0, void 0, function () {
-              var res, data, error_1;
-              var _a;
-              return __generator(this, function (_b) {
-                  switch (_b.label) {
+              var res, data_1, error_1;
+              var _a, _b;
+              return __generator(this, function (_c) {
+                  switch (_c.label) {
                       case 0:
                           if (!isFunction(props.remoteMethod)) return [3 /*break*/, 4];
-                          _b.label = 1;
+                          _c.label = 1;
                       case 1:
-                          _b.trys.push([1, 3, , 4]);
+                          _c.trys.push([1, 3, , 4]);
                           loading.value = true;
                           return [4 /*yield*/, ((_a = props.remoteMethod) === null || _a === void 0 ? void 0 : _a.call(props, val))];
                       case 2:
-                          res = _b.sent();
-                          data = xrkTools.check.isObject(res.data)
+                          res = _c.sent();
+                          data_1 = xrkTools.check.isObject(res.data)
                               ? Array.isArray(res.data.list)
                                   ? res.data.list
                                   : []
@@ -73239,17 +73240,29 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                                   ? res.data
                                   : [];
                           loading.value = false;
+                          if (!val && ((_b = props.remoteSelected) === null || _b === void 0 ? void 0 : _b.length)) {
+                              props.remoteSelected.forEach(function (select) {
+                                  var _a;
+                                  if (select[props.labelKey] !== undefined &&
+                                      select[props.valueKey] !== undefined) {
+                                      // 不存在则添加
+                                      if (!data_1.some(function (item) { return item[props.valueKey] === select[props.valueKey]; })) {
+                                          data_1.push(__assign(__assign({}, select), (_a = {}, _a[props.labelKey] = select[props.labelKey], _a[props.valueKey] = select[props.valueKey], _a)));
+                                      }
+                                  }
+                              });
+                          }
                           if (props.notRemoteAutoFilter) {
-                              _options.value = Array.isArray(data) ? data : [];
+                              _options.value = Array.isArray(data_1) ? data_1 : [];
                               return [2 /*return*/];
                           }
                           // 避免多次请求接口 接口响应先后顺序不一致导致数据错乱
-                          _options.value = Array.isArray(data)
-                              ? data.filter(function (i) { return !val || "".concat(i[props.labelKey || 'label']).indexOf(val) > -1; })
+                          _options.value = Array.isArray(data_1)
+                              ? data_1.filter(function (i) { return !val || "".concat(i[props.labelKey || 'label']).indexOf(val) > -1; })
                               : [];
                           return [3 /*break*/, 4];
                       case 3:
-                          error_1 = _b.sent();
+                          error_1 = _c.sent();
                           loading.value = false;
                           console.error(error_1);
                           return [3 /*break*/, 4];
@@ -73949,7 +73962,9 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                   text: '重置',
                   show: true
               }); } },
-          otherComponents: { type: null, required: false }
+          otherComponents: { type: null, required: false },
+          syncQueryToSearch: { type: Boolean, required: false },
+          syncSearchToQuery: { type: Boolean, required: false }
       }, emits: ["search"], setup: function (__props, _a) {
           var _this = this;
           var expose = _a.expose, emits = _a.emit;
@@ -75013,8 +75028,10 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           appendToBody: false }, options));
       // inject 函数调用组件导致内部inject无法接收到，需要使用app.provide（全局）：  https://github.com/vuejs/core/issues/6220
       // context createApp需要use插件，内部才能使用插件\库相关API。可以直接修改上下文： https://github.com/vuejs/core/issues/2097
+      // main APP为_context， 组件上下文为appContext
+      // 如果不关联该项，会导致使用useCreateModal的函数组件内无法使用provide\route等需关联上下文的函数
       if (app) {
-          _instance.appContext = app._context; // 承接上下文，用于inject，调用层需要使用app.provide
+          _instance.appContext = app['_context'] || app['appContext']; // 承接上下文，用于inject，调用层需要使用app.provide
       }
       vue.render(_instance, container);
       (_a = document.querySelector('body')) === null || _a === void 0 ? void 0 : _a.appendChild(container);
@@ -77138,6 +77155,7 @@ 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 },
@@ -77220,7 +77238,9 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                       case 0:
                           searchQuery.value = xrkTools.base.deepClone(searchValue);
                           initPageInfo(1);
-                          clearSelectionRows();
+                          if (!props.reserveSelection) {
+                              clearSelectionRows();
+                          }
                           return [4 /*yield*/, (getList === null || getList === void 0 ? void 0 : getList(query.value))];
                       case 1:
                           _a.sent();
@@ -77343,15 +77363,17 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                   (!__props.searchConfig.hide)
                       ? (vue.openBlock(), vue.createBlock(script$i, {
                           key: 1,
+                          style: { "margin-bottom": "16px" },
                           ref_key: "XrkSearchRef",
                           ref: XrkSearchRef,
                           columns: __props.searchConfig.searchColumns,
                           "search-btn": __props.searchConfig.searchBtn,
                           "reset-btn": __props.searchConfig.resetBtn,
                           "other-components": __props.searchConfig.otherComponents,
-                          onSearch: handleSearch,
-                          style: { "margin-bottom": "16px" }
-                      }, null, 8 /* PROPS */, ["columns", "search-btn", "reset-btn", "other-components"]))
+                          "sync-query-to-search": __props.searchConfig.syncQueryToSearch,
+                          "sync-search-to-query": __props.searchConfig.syncSearchToQuery,
+                          onSearch: handleSearch
+                      }, null, 8 /* PROPS */, ["columns", "search-btn", "reset-btn", "other-components", "sync-query-to-search", "sync-search-to-query"]))
                       : vue.createCommentVNode("v-if", true),
                   (vue.unref(slots).tableBefore)
                       ? vue.renderSlot(_ctx.$slots, "tableBefore", {

package/lib/packages/base/select/index.d.ts

@@ -84,6 +84,13 @@ export interface BaseSelectProps extends BaseSelectListener {
      * 远程方法
      */
     remoteMethod?: (searchVal?: string) => any;
+    /**
+     *  远程-已选中数据，解决初始数据时远程搜索数据不包含已选数据，包括多项选择。
+     *  key必须对应labelKey与valueKey。
+     *  对象可添加多个属性不限于label value。
+     *  有搜索条件不添加，其他情况都添加。data无数据也要push。
+     */
+    remoteSelected?: Array<Record<string, any>>;
     /**
      * 远程方法-是否自动过滤数据
      */

package/lib/packages/base/select/select.d.ts

@@ -94,6 +94,10 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         required: false;
     };
+    remoteSelected: {
+        type: ArrayConstructor;
+        required: false;
+    };
     notRemoteAutoFilter: {
         type: BooleanConstructor;
         required: false;
@@ -219,6 +223,10 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         required: false;
     };
+    remoteSelected: {
+        type: ArrayConstructor;
+        required: false;
+    };
     notRemoteAutoFilter: {
         type: BooleanConstructor;
         required: false;

package/lib/packages/hooks/use-create-modal.d.ts

@@ -1,10 +1,13 @@
-import { App, Component } from 'vue';
+import { App, Component, ComponentInternalInstance } from 'vue';
 declare type anyObj = Record<string, any>;
 interface ModalInstance {
     remove(): void;
     close(): void;
     $updateProps(props: anyObj): void;
 }
-export declare const useCreateModal: (component: Component, options?: anyObj, app?: App) => ModalInstance;
+interface InstanceComponent extends ComponentInternalInstance {
+    ctx: ModalInstance;
+}
+export declare const useCreateModal: (component: Component, options?: anyObj, app?: App | InstanceComponent) => ModalInstance;
 declare const install: (app: App, component: Component, options: anyObj) => void;
 export default install;

package/lib/packages/xrk/search/index.d.ts

@@ -13,10 +13,34 @@ export declare const formItemComponents: import("vue").Ref<{
     upload: any;
 }>;
 export declare type XrkSearchProps<T extends Record<string, any> = any> = {
+    /**
+     * 搜索项
+     */
     columns: Array<SearchColumnType<T>>;
+    /**
+     * 搜索按钮配置
+     * 点击时，执行顺序 beforeSearch -> emit.search -> afterSearch
+     */
     searchBtn?: SearchBtnType<T>;
+    /**
+     * 重置按钮配置
+     * 点击时，执行顺序  清空组件内的值 -> beforeReset -> emit.search -> afterReset
+     */
     resetBtn?: ResetBtnType<T>;
+    /**
+     * 其他组件
+     */
     otherComponents?: Array<ComponentRender<T>>;
+    /**
+     * 通过query 同步到搜索项value中
+     * 未实现
+     */
+    syncQueryToSearch?: boolean;
+    /**
+     * 通过搜索项 同步到route.query中
+     * 未实现
+     */
+    syncSearchToQuery?: boolean;
 };
 export declare type XrkSearchRef<T extends Record<string, any> = any> = {
     /**

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

@@ -27,6 +27,14 @@ declare const _default: import("vue").DefineComponent<{
         type: null;
         required: false;
     };
+    syncQueryToSearch: {
+        type: BooleanConstructor;
+        required: false;
+    };
+    syncSearchToQuery: {
+        type: BooleanConstructor;
+        required: false;
+    };
 }, (_ctx: any, _cache: any) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
 }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "search"[], "search", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -58,11 +66,21 @@ declare const _default: import("vue").DefineComponent<{
         type: null;
         required: false;
     };
+    syncQueryToSearch: {
+        type: BooleanConstructor;
+        required: false;
+    };
+    syncSearchToQuery: {
+        type: BooleanConstructor;
+        required: false;
+    };
 }>> & {
     onSearch?: ((...args: any[]) => any) | undefined;
 }, {
     loading: boolean;
     searchBtn: any;
     resetBtn: any;
+    syncQueryToSearch: boolean;
+    syncSearchToQuery: boolean;
 }>;
 export default _default;

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

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

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

@@ -1,5 +1,6 @@
 import { BaseTableColumnProps, BaseTableProps } from '../../../base/table/types/type';
-import { ComponentRender, ResetBtnType, SearchBtnType, SearchColumnType } from '../../search/types/type';
+import { SearchColumnType } from '../../search/types/type';
+import { XrkSearchProps } from '../../search/index';
 declare type Result<T = any> = {
     code?: number;
     message?: string;
@@ -21,6 +22,11 @@ export declare type XrkTableProps<S extends Record<string, any> = any, T extends
      * 是否固定高度 滚动表格
      */
     fix?: boolean;
+    /**
+     * 点击搜索是否重置选中项，默认false清空
+     * 由xrk-table维护
+     */
+    reserveSelection?: boolean;
     /**
      * 获取表格数据
      */
@@ -34,24 +40,10 @@ export declare type XrkTableProps<S extends Record<string, any> = any, T extends
          */
         hide?: boolean;
         /**
-         * 搜索项
+         * 搜索项，与search中的columns一致
          */
         searchColumns: Array<SearchColumnType<S>>;
-        /**
-         * 搜索按钮配置
-         * 点击时，执行顺序 beforeSearch -> emit.search -> afterSearch
-         */
-        searchBtn?: SearchBtnType<S>;
-        /**
-         * 重置按钮配置
-         * 点击时，执行顺序  清空组件内的值 -> beforeReset -> emit.search -> afterReset
-         */
-        resetBtn?: ResetBtnType<S>;
-        /**
-         * 其他组件
-         */
-        otherComponents?: Array<ComponentRender<S>>;
-    };
+    } & Omit<XrkSearchProps<S>, 'columns'>;
     /**
      * 表格配置
      */

package/package.json

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