@epie/bi-crud 2.0.45 → 2.0.48

package/lib/bi-crud.esm.js

@@ -8041,6 +8041,52 @@ var src = {exports: {}};
 })(src, src.exports);
 var merge$1 = /*@__PURE__*/getDefaultExportFromCjs(src.exports);
 
+/**
+ * 将 crud.params 的内部键名映射为请求参数名（dict.pagination / search / sort 的「键」为内部名，「值」为请求名）
+ */
+function replaceParamsByDict(params, dict) {
+  const {
+    pagination = {},
+    search = {},
+    sort = {}
+  } = dict;
+  const a = {
+    ...params
+  };
+  const b = {
+    ...pagination,
+    ...search,
+    ...sort
+  };
+  // 清理 null/undefined，避免 GET 序列化成字符串 "null"/"undefined"
+  for (const k in a) {
+    if (a[k] === null || a[k] === undefined) {
+      delete a[k];
+    }
+  }
+  for (const i in b) {
+    if (b[i] === undefined || b[i] === null) continue;
+    if (!Object.prototype.hasOwnProperty.call(a, i)) continue;
+    if (i !== b[i]) {
+      a[`_${b[i]}`] = a[i];
+      delete a[i];
+    }
+  }
+  for (const i in a) {
+    if (i[0] === "_") {
+      a[i.substring(1)] = a[i];
+      delete a[i];
+    }
+  }
+  // 再清理一次，覆盖映射后的键
+  for (const k in a) {
+    if (a[k] === null || a[k] === undefined) {
+      delete a[k];
+    }
+  }
+  return a;
+}
+
 function isArray$1(value) {
   if (typeof Array.isArray === "function") {
     return Array.isArray(value);
@@ -8449,36 +8495,7 @@ function useHelper({
   }
   // 根据字典替换请求参数
   function paramsReplace(params) {
-    const {
-      pagination,
-      search,
-      sort
-    } = crud.dict;
-    // 请求参数
-    const a = {
-      ...params
-    };
-    // 字典
-    const b = {
-      ...pagination,
-      ...search,
-      ...sort
-    };
-    for (const i in b) {
-      if (a[i]) {
-        if (i != b[i]) {
-          a[`_${b[i]}`] = a[i];
-          delete a[i];
-        }
-      }
-    }
-    for (const i in a) {
-      if (i[0] === "_") {
-        a[i.substr(1)] = a[i];
-        delete a[i];
-      }
-    }
-    return a;
+    return replaceParamsByDict(params, crud.dict);
   }
   // 刷新请求
   function refresh(params) {
@@ -28477,7 +28494,7 @@ var Pagination = defineComponent({
         currentPage.value = res.currentPage || res.page || 1;
         pageSize.value = res.pageSize || res.size || 20;
         total.value = res.total | 0;
-        crud.params.size = pageSize.value;
+        crud.params.pageSize = pageSize.value;
       }
     }
     mitt.on("crud.refresh", ({
@@ -28658,38 +28675,8 @@ var ExportBtn = defineComponent({
     } = useCore();
     const exportVisible = ref(false);
     const exportLoading = ref(false);
-    // 根据字典替换请求参数
     function paramsReplaceExport(params) {
-      const {
-        pagination,
-        search,
-        sort
-      } = crud.dict;
-      // 请求参数
-      const a = {
-        ...params
-      };
-      // 字典
-      const b = {
-        ...pagination,
-        ...search,
-        ...sort
-      };
-      for (const i in b) {
-        if (a[i]) {
-          if (i != b[i]) {
-            a[`_${b[i]}`] = a[i];
-            delete a[i];
-          }
-        }
-      }
-      for (const i in a) {
-        if (i[0] === "_") {
-          a[i.substr(1)] = a[i];
-          delete a[i];
-        }
-      }
-      return a;
+      return replaceParamsByDict(params, crud.dict);
     }
     const onExport = () => {
       return new Promise(r1 => {

package/lib/bi-crud.umd.js

@@ -8044,6 +8044,52 @@
 	})(src, src.exports);
 	var merge$1 = /*@__PURE__*/getDefaultExportFromCjs(src.exports);
 
+	/**
+	 * 将 crud.params 的内部键名映射为请求参数名（dict.pagination / search / sort 的「键」为内部名，「值」为请求名）
+	 */
+	function replaceParamsByDict(params, dict) {
+	  const {
+	    pagination = {},
+	    search = {},
+	    sort = {}
+	  } = dict;
+	  const a = {
+	    ...params
+	  };
+	  const b = {
+	    ...pagination,
+	    ...search,
+	    ...sort
+	  };
+	  // 清理 null/undefined，避免 GET 序列化成字符串 "null"/"undefined"
+	  for (const k in a) {
+	    if (a[k] === null || a[k] === undefined) {
+	      delete a[k];
+	    }
+	  }
+	  for (const i in b) {
+	    if (b[i] === undefined || b[i] === null) continue;
+	    if (!Object.prototype.hasOwnProperty.call(a, i)) continue;
+	    if (i !== b[i]) {
+	      a[`_${b[i]}`] = a[i];
+	      delete a[i];
+	    }
+	  }
+	  for (const i in a) {
+	    if (i[0] === "_") {
+	      a[i.substring(1)] = a[i];
+	      delete a[i];
+	    }
+	  }
+	  // 再清理一次，覆盖映射后的键
+	  for (const k in a) {
+	    if (a[k] === null || a[k] === undefined) {
+	      delete a[k];
+	    }
+	  }
+	  return a;
+	}
+
 	function isArray$1(value) {
 	  if (typeof Array.isArray === "function") {
 	    return Array.isArray(value);
@@ -8452,36 +8498,7 @@
 	  }
 	  // 根据字典替换请求参数
 	  function paramsReplace(params) {
-	    const {
-	      pagination,
-	      search,
-	      sort
-	    } = crud.dict;
-	    // 请求参数
-	    const a = {
-	      ...params
-	    };
-	    // 字典
-	    const b = {
-	      ...pagination,
-	      ...search,
-	      ...sort
-	    };
-	    for (const i in b) {
-	      if (a[i]) {
-	        if (i != b[i]) {
-	          a[`_${b[i]}`] = a[i];
-	          delete a[i];
-	        }
-	      }
-	    }
-	    for (const i in a) {
-	      if (i[0] === "_") {
-	        a[i.substr(1)] = a[i];
-	        delete a[i];
-	      }
-	    }
-	    return a;
+	    return replaceParamsByDict(params, crud.dict);
 	  }
 	  // 刷新请求
 	  function refresh(params) {
@@ -28480,7 +28497,7 @@
 	        currentPage.value = res.currentPage || res.page || 1;
 	        pageSize.value = res.pageSize || res.size || 20;
 	        total.value = res.total | 0;
-	        crud.params.size = pageSize.value;
+	        crud.params.pageSize = pageSize.value;
 	      }
 	    }
 	    mitt.on("crud.refresh", ({
@@ -28661,38 +28678,8 @@
 	    } = useCore();
 	    const exportVisible = vue.ref(false);
 	    const exportLoading = vue.ref(false);
-	    // 根据字典替换请求参数
 	    function paramsReplaceExport(params) {
-	      const {
-	        pagination,
-	        search,
-	        sort
-	      } = crud.dict;
-	      // 请求参数
-	      const a = {
-	        ...params
-	      };
-	      // 字典
-	      const b = {
-	        ...pagination,
-	        ...search,
-	        ...sort
-	      };
-	      for (const i in b) {
-	        if (a[i]) {
-	          if (i != b[i]) {
-	            a[`_${b[i]}`] = a[i];
-	            delete a[i];
-	          }
-	        }
-	      }
-	      for (const i in a) {
-	        if (i[0] === "_") {
-	          a[i.substr(1)] = a[i];
-	          delete a[i];
-	        }
-	      }
-	      return a;
+	      return replaceParamsByDict(params, crud.dict);
 	    }
 	    const onExport = () => {
 	      return new Promise(r1 => {

package/lib/components/descriptions/descriptions.d.ts

@@ -14,7 +14,7 @@ export declare const epieDescriptionsProps: () => {
         default: string;
     };
     size: {
-        type: PropType<"" | "default" | "small" | "large">;
+        type: PropType<"" | "small" | "default" | "large">;
     };
     title: {
         type: StringConstructor;
@@ -44,7 +44,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     size: {
-        type: PropType<"" | "default" | "small" | "large">;
+        type: PropType<"" | "small" | "default" | "large">;
     };
     title: {
         type: StringConstructor;
@@ -75,7 +75,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     size: {
-        type: PropType<"" | "default" | "small" | "large">;
+        type: PropType<"" | "small" | "default" | "large">;
     };
     title: {
         type: StringConstructor;

package/lib/hooks/core.d.ts

@@ -1,6 +1,6 @@
 import { EpieCrud, Emitter } from "../types";
 export declare function useRefs(): {
-    refs: import("vue").Ref<any, any>;
+    refs: import("vue").Ref<any>;
     setRefs: (index: number) => (el: HTMLElement) => void;
 };
 export declare function useTools(): {

package/lib/utils/index.d.ts

@@ -15,4 +15,5 @@ export declare function contains(parent: any, node: any): any;
 export declare function deepMerge(a: any, b: any): any;
 export declare function addClass(el: Element, name: string): void;
 export declare function removeClass(el: Element, name: string): void;
+export { replaceParamsByDict } from "./paramsReplace";
 export { cloneDeep, flat, merge };

package/lib/utils/paramsReplace.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 将 crud.params 的内部键名映射为请求参数名（dict.pagination / search / sort 的「键」为内部名，「值」为请求名）
+ */
+export declare function replaceParamsByDict(params: any, dict: {
+    pagination?: any;
+    search?: any;
+    sort?: any;
+}): any;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@epie/bi-crud",
   "simpleName": "bi-crud",
-  "version": "2.0.45",
+  "version": "2.0.48",
   "private": false,
   "main": "lib/bi-crud.umd.js",
   "module": "lib/bi-crud.esm.js",