@pisell/materials 1.0.413 → 1.0.415

package/es/components/table/Actions/component/ExportImport/components/ExportTable/function.js

@@ -70,10 +70,13 @@ export var batchExport = function batchExport(exportParams, exportImport) {
   // 所有记录
   if (type === "all-records") {
     _name = "".concat(getText("table-action-export-import-all-records")).concat(_name);
-    var _lists = (exportParams === null || exportParams === void 0 ? void 0 : exportParams.originDataSource) || [];
-    params.ids = _lists.map(function (item) {
-      return (item === null || item === void 0 ? void 0 : item.id) || (item === null || item === void 0 ? void 0 : item.form_record_id);
-    });
+    // 表单则直接导出
+    if (otherParams !== null && otherParams !== void 0 && otherParams.form_id || otherParams !== null && otherParams !== void 0 && otherParams.code) {
+      var _lists = (exportParams === null || exportParams === void 0 ? void 0 : exportParams.originDataSource) || [];
+      params.ids = _lists.map(function (item) {
+        return (item === null || item === void 0 ? void 0 : item.id) || (item === null || item === void 0 ? void 0 : item.form_record_id);
+      });
+    }
     params.file_name = _name;
   }
 
@@ -83,5 +86,12 @@ export var batchExport = function batchExport(exportParams, exportImport) {
     params.ids = selectLists || [];
     params.file_name = _name;
   }
+
+  // 不是所有记录则删除对应的参数
+  if (type !== 'all-records') {
+    params === null || params === void 0 ? true : delete params.shipping_status;
+    params === null || params === void 0 ? true : delete params.payment_status;
+    params === null || params === void 0 ? true : delete params.status;
+  }
   return _batchExport(params);
 };

package/es/components/table/Actions/component/ExportImport/utils/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @title: 格式化导出导入接口地址
+ * @description:
+ * @param {string} url
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-09-05 11:39
+ */
+export declare const formatApiUrl: (url: string) => string;

package/es/components/table/Actions/component/ExportImport/utils/index.js

@@ -0,0 +1,11 @@
+/**
+ * @title: 格式化导出导入接口地址
+ * @description: 
+ * @param {string} url
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-09-05 11:39
+ */
+export var formatApiUrl = function formatApiUrl(url) {
+  return url || '/shop/form/data';
+};

package/es/components/table/Table/utils.d.ts

@@ -167,7 +167,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/es/components/table/serve.js

@@ -29,6 +29,13 @@ var formatApiParams = function formatApiParams(params, type) {
   var _url = (params === null || params === void 0 ? void 0 : params.url) || (defaultUrl === null || defaultUrl === void 0 ? void 0 : defaultUrl[type]);
   var _params = _objectSpread({}, params);
   delete _params.url;
+
+  // 删除无用数据
+  if (type !== 'export') {
+    _params === null || _params === void 0 ? true : delete _params.shipping_status;
+    _params === null || _params === void 0 ? true : delete _params.payment_status;
+    _params === null || _params === void 0 ? true : delete _params.status;
+  }
   return {
     url: _url,
     params: _objectSpread({}, _params)

package/lib/components/table/Actions/component/ExportImport/components/ExportTable/function.js

@@ -54,8 +54,10 @@ var batchExport = (exportParams, exportImport) => {
   }
   if (type === "all-records") {
     _name = `${(0, import_locales.getText)("table-action-export-import-all-records")}${_name}`;
-    const lists = (exportParams == null ? void 0 : exportParams.originDataSource) || [];
-    params.ids = lists.map((item) => (item == null ? void 0 : item.id) || (item == null ? void 0 : item.form_record_id));
+    if ((otherParams == null ? void 0 : otherParams.form_id) || (otherParams == null ? void 0 : otherParams.code)) {
+      const lists = (exportParams == null ? void 0 : exportParams.originDataSource) || [];
+      params.ids = lists.map((item) => (item == null ? void 0 : item.id) || (item == null ? void 0 : item.form_record_id));
+    }
     params.file_name = _name;
   }
   if (type === "selected-records") {
@@ -65,6 +67,11 @@ var batchExport = (exportParams, exportImport) => {
     params.ids = selectLists || [];
     params.file_name = _name;
   }
+  if (type !== "all-records") {
+    params == null ? true : delete params.shipping_status;
+    params == null ? true : delete params.payment_status;
+    params == null ? true : delete params.status;
+  }
   return _batchExport(params);
 };
 // Annotate the CommonJS export names for ESM import in node:

package/lib/components/table/Actions/component/ExportImport/utils/index.d.ts

@@ -0,0 +1,9 @@
+/**
+ * @title: 格式化导出导入接口地址
+ * @description:
+ * @param {string} url
+ * @return {*}
+ * @Author: WangHan
+ * @Date: 2024-09-05 11:39
+ */
+export declare const formatApiUrl: (url: string) => string;

package/lib/components/table/Actions/component/ExportImport/utils/index.js

@@ -0,0 +1,31 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/table/Actions/component/ExportImport/utils/index.ts
+var utils_exports = {};
+__export(utils_exports, {
+  formatApiUrl: () => formatApiUrl
+});
+module.exports = __toCommonJS(utils_exports);
+var formatApiUrl = (url) => {
+  return url || "/shop/form/data";
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatApiUrl
+});

package/lib/components/table/Table/utils.d.ts

@@ -167,7 +167,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/lib/components/table/serve.js

@@ -38,6 +38,11 @@ var formatApiParams = (params, type) => {
   const _url = (params == null ? void 0 : params.url) || (defaultUrl == null ? void 0 : defaultUrl[type]);
   let _params = { ...params };
   delete _params.url;
+  if (type !== "export") {
+    _params == null ? true : delete _params.shipping_status;
+    _params == null ? true : delete _params.payment_status;
+    _params == null ? true : delete _params.status;
+  }
   return {
     url: _url,
     params: { ..._params }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.413",
+  "version": "1.0.415",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",