@pisell/materials 2.2.27 → 2.2.28

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/index.js

@@ -17,6 +17,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import { useDebounce, useSize } from 'ahooks';
 import { Form } from 'antd';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
+import classNames from 'classNames';
 import { useSharedState } from "../../hooks";
 import useEngineContext from "../../hooks/useEngineContext";
 import Actions from "./Actions";
@@ -79,6 +80,10 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     wait: 100
   });
   var utils = context === null || context === void 0 ? void 0 : (_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : _context$appHelper.utils;
+  var isTerminal = useMemo(function () {
+    var _utils$isTerminal;
+    return utils === null || utils === void 0 ? void 0 : (_utils$isTerminal = utils.isTerminal) === null || _utils$isTerminal === void 0 ? void 0 : _utils$isTerminal.call(utils);
+  }, [utils]);
   var tableId = useMemo(function () {
     if (props.__designMode === 'design') {
       return 'designMode-mock-table-id';
@@ -285,7 +290,9 @@ var GridView = Provider( /*#__PURE__*/forwardRef(function (props, ref) {
     },
     className: "materials-grid-form-wrap"
   }, /*#__PURE__*/React.createElement("div", {
-    className: 'materials-grid',
+    className: classNames('materials-grid', {
+      'materials-grid-terminal': isTerminal
+    }),
     style: style,
     ref: wrapRef
   }, /*#__PURE__*/React.createElement(Header, {

package/es/components/table/index.less

@@ -144,4 +144,10 @@
       justify-content: center;
     }
   }
+}
+
+.materials-grid-terminal {
+  .pisell-lowcode-table-cell-row-hover {
+    background-color: transparent !important;
+  }
 }

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/index.js

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(table_exports);
 var import_ahooks = require("ahooks");
 var import_antd = require("antd");
 var import_react = __toESM(require("react"));
+var import_classNames = __toESM(require("classNames"));
 var import_hooks = require("../../hooks");
 var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var import_Actions = __toESM(require("./Actions"));
@@ -91,6 +92,10 @@ var GridView = (0, import_model.Provider)(
     const { width } = (0, import_ahooks.useSize)(wrapRef) || {};
     const debouncedWidth = (0, import_ahooks.useDebounce)(width, { wait: 100 });
     const utils = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils;
+    const isTerminal = (0, import_react.useMemo)(() => {
+      var _a2;
+      return (_a2 = utils == null ? void 0 : utils.isTerminal) == null ? void 0 : _a2.call(utils);
+    }, [utils]);
     const tableId = (0, import_react.useMemo)(() => {
       if (props.__designMode === "design") {
         return "designMode-mock-table-id";
@@ -299,30 +304,43 @@ var GridView = (0, import_model.Provider)(
         },
         className: "materials-grid-form-wrap"
       },
-      /* @__PURE__ */ import_react.default.createElement("div", { className: "materials-grid", style, ref: wrapRef }, /* @__PURE__ */ import_react.default.createElement(import_Header.default, { title, buttons }), /* @__PURE__ */ import_react.default.createElement(
-        import_Actions.default,
-        {
-          view,
-          buttons: actionButtons,
-          columnSetting,
-          dataSourceGroup,
-          filter,
-          sort,
-          tableId,
-          localPagination: (_e = other == null ? void 0 : other.pagination) == null ? void 0 : _e.localPagination,
-          gallery,
-          exportImport
-        }
-      ), /* @__PURE__ */ import_react.default.createElement(import_Summary.default, { summary }), /* @__PURE__ */ import_react.default.createElement(
-        import_View.default,
+      /* @__PURE__ */ import_react.default.createElement(
+        "div",
         {
-          ...props,
-          filter,
-          sort,
-          setTableSetting,
-          dataSourceGroup
-        }
-      ))
+          className: (0, import_classNames.default)("materials-grid", {
+            "materials-grid-terminal": isTerminal
+          }),
+          style,
+          ref: wrapRef
+        },
+        /* @__PURE__ */ import_react.default.createElement(import_Header.default, { title, buttons }),
+        /* @__PURE__ */ import_react.default.createElement(
+          import_Actions.default,
+          {
+            view,
+            buttons: actionButtons,
+            columnSetting,
+            dataSourceGroup,
+            filter,
+            sort,
+            tableId,
+            localPagination: (_e = other == null ? void 0 : other.pagination) == null ? void 0 : _e.localPagination,
+            gallery,
+            exportImport
+          }
+        ),
+        /* @__PURE__ */ import_react.default.createElement(import_Summary.default, { summary }),
+        /* @__PURE__ */ import_react.default.createElement(
+          import_View.default,
+          {
+            ...props,
+            filter,
+            sort,
+            setTableSetting,
+            dataSourceGroup
+          }
+        )
+      )
     );
   })
 );

package/lib/components/table/index.less

@@ -144,4 +144,10 @@
       justify-content: center;
     }
   }
+}
+
+.materials-grid-terminal {
+  .pisell-lowcode-table-cell-row-hover {
+    background-color: transparent !important;
+  }
 }

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": "2.2.27",
+  "version": "2.2.28",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -63,9 +63,9 @@
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
     "@zxing/library": "0.21.2",
-    "@pisell/utils": "2.0.1",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "1.0.103"
+    "@pisell/date-picker": "1.0.100",
+    "@pisell/utils": "2.0.1"
   },
   "peerDependencies": {
     "react": "^18.0.0",