@vue-ui-kit/ant 2.1.1 → 2.1.3

package/dist/packages/components/PCanvasGrid.vue.d.ts

@@ -25,6 +25,7 @@ declare const _default: <D extends Recordable = Recordable, F extends Recordable
             reload: () => void;
             reloadPage: () => Promise<D[]>;
             passQuery: (params: Partial<F>, lazy?: boolean) => any;
+            forcePassQuery: (params: Partial<F>, lazy?: boolean) => any;
         };
         $canvasTable: import('vue').ComputedRef<PCanvasTableInstance<D> | undefined>;
         selectedRowKeys: import('vue').ComputedRef<(string | number)[]>;

package/dist/packages/components/PGrid.vue.d.ts

@@ -26,6 +26,7 @@ declare const _default: <D extends Recordable = Recordable, F extends Recordable
             reload: () => void;
             reloadPage: () => Promise<D[]>;
             passQuery: (params: Partial<F>, lazy?: boolean) => any;
+            forcePassQuery: (params: Partial<F>, lazy?: boolean) => any;
         };
         $table: import('vue').ComputedRef<import('vue').CreateComponentPublicInstanceWithMixins<Readonly<import('vue').ExtractPropTypes<{
             prefixCls: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-ui-kit/ant",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "description": "Vue3 UI Kit based on Ant Design",
   "type": "module",
   "main": "./dist/cjs/index.js",

package/src/declarations/antProxy.ts

@@ -166,7 +166,7 @@ export interface ToolbarConfig {
   buttons?: Array<ToolbarButtonProps>;
   tools?: Array<{
     code: string;
-    icon: string;
+    icon?: string;
     type?: ButtonType;
     content?: string;
     disabled?: boolean;
@@ -371,6 +371,7 @@ export interface PGridInstance<
     reload: () => Promise<D[]>;
     reloadPage: () => Promise<D[]>;
     passQuery: (query: Partial<F>, lazy?: boolean) => Promise<void | D[]>;
+    forcePassQuery: (query: Partial<F>, lazy?: boolean) => Promise<void | D[]>;
   };
   selectedRowKeys: string[] | number[];
   selectedRecords: D[];

package/src/packages/components/PCanvasGrid.vue

@@ -276,6 +276,11 @@
     pagination.page = 1;
     return lazy ? Promise.resolve() : debounceFetchData();
   };
+  const forcePassQuery = (params: Partial<F>, lazy?: boolean) => {
+    queryFormData.value = params;
+    pagination.page = 1;
+    return lazy ? Promise.resolve() : debounceFetchData();
+  };
   const innerToolbarHandler = (code: string) => {
     const { ajax } = proxyConfig.value!;
     switch (code) {
@@ -424,6 +429,7 @@
       reload,
       reloadPage: resetPage,
       passQuery,
+      forcePassQuery,
     },
     $canvasTable: computed(() => canvasTableRef.value),
     selectedRowKeys,
@@ -516,7 +522,7 @@
               @click="debounceToolToolClick(tool.code)"
               :loading="loading.toolbar || (!!tool.code && codeLoadings[tool.code])"
             >
-              <Icon :icon="tool.icon" />
+              <Icon v-if="tool.icon" :icon="tool.icon" />
               {{ tool.content }}
             </a-button>
           </template>

package/src/packages/components/PGrid.vue

@@ -362,6 +362,11 @@
     pagination.page = 1;
     return lazy ? Promise.resolve() : debounceFetchData();
   };
+  const forcePassQuery = (params: Partial<F>, lazy?: boolean) => {
+    queryFormData.value = params;
+    pagination.page = 1;
+    return lazy ? Promise.resolve() : debounceFetchData();
+  };
   const pg = computed(() =>
     mode.value === 'pagination'
       ? {
@@ -447,6 +452,7 @@
       reload,
       reloadPage: resetPage,
       passQuery,
+      forcePassQuery,
     },
     $table: computed(() => tableEl.value),
     selectedRowKeys: computed(() => selectedRowKeys.value),
@@ -578,7 +584,6 @@
               :loading="loading.toolbar || (!!tool.code && codeLoadings[tool.code])"
             >
               <Icon :icon="tool.icon" />
-              {{ tool.content }}
             </a-button>
           </template>
         </span>

package/src/packages/utils/config.ts

@@ -34,7 +34,7 @@ const defaultConfig: UIKitConfig = {
 };
 
 // 当前配置（可被修改）
-let currentConfig: UIKitConfig = clone(defaultConfig);
+let currentConfig: UIKitConfig = clone(defaultConfig, true);
 
 // 设置配置
 export function setUIKitConfig(config: Partial<UIKitConfig>): void {

package/src/packages/utils/core.ts

@@ -61,12 +61,12 @@ export function watchPreviousDeep<T extends object>(
   if (typeof val !== 'object' || val === null) {
     return watch(source, cb as WatchCallback<T>, options);
   }
-  let previousValue = clone(val) as T;
+  let previousValue = clone(val, true) as T;
   return watch(
     source,
     (crtValue, _, onCleanup) => {
       cb(crtValue as T, previousValue, onCleanup as () => void);
-      previousValue = clone(crtValue) as T;
+      previousValue = clone(crtValue, true) as T;
     },
     options,
   );