@pisell/materials 1.0.321 → 1.0.322

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

@@ -24,6 +24,7 @@ import { batchExport } from "./components/ExportTable/function";
 import ImportLog from "./components/ImportLog";
 import ImportTable from "./components/ImportTable";
 import { useSharedState } from "../../../../../hooks";
+import { getCurrentLocale } from "../../../../../utils/locale";
 import { Context } from "../../../model";
 import "./index.less";
 var Com = {
@@ -33,6 +34,7 @@ var Com = {
   import_log: ImportLog
 };
 var ExportImport = function ExportImport(_ref) {
+  var _context$appHelper, _context$appHelper$ut;
   var exportImport = _ref.exportImport;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -59,7 +61,7 @@ var ExportImport = function ExportImport(_ref) {
   var originResultDataSource = state.originResultDataSource,
     currentDataSource = state.currentDataSource;
   var context = useEngineContext();
-  request.setRequest(context.appHelper.utils.request);
+  request.setRequest((_context$appHelper = context.appHelper) === null || _context$appHelper === void 0 ? void 0 : (_context$appHelper$ut = _context$appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : _context$appHelper$ut.request);
   var _items = useMemo(function () {
     // 将对象转成数组
     var result = Object.entries(exportImportOptions).map(function (_ref2) {
@@ -74,9 +76,9 @@ var ExportImport = function ExportImport(_ref) {
     return result;
   }, []);
   var Content = useMemo(function () {
-    if (!value) return null;
-    return Com[value];
-  }, [value]);
+    var _value = value || defaultOptions.importValue;
+    return Com[_value];
+  }, [value, defaultOptions.importValue]);
   var _footer = useMemo(function () {
     var types = defaultOptions.footerHintTypes;
     if (types.includes(value)) {
@@ -90,10 +92,12 @@ var ExportImport = function ExportImport(_ref) {
   var _title = useMemo(function () {
     if (!value) return null;
     var types = defaultOptions.okShowButtonTypes;
+    var lang = getCurrentLocale();
+    var isEn = lang === "en-US" || lang === "en";
 
     // 导出导入标题
     if (types.includes(value) && exportImport !== null && exportImport !== void 0 && exportImport.title) {
-      return "".concat(exportImportOptions[value]).concat(exportImport.title);
+      return "".concat(exportImportOptions[value]).concat(isEn ? " " : "").concat(exportImport.title);
     }
     return exportImportOptions[value];
   }, [value, exportImport === null || exportImport === void 0 ? void 0 : exportImport.title]);

package/es/components/table/BasicTable/index.d.ts

@@ -1,4 +1,4 @@
-import { TableProps } from "antd";
-import React from "react";
+import { TableProps } from 'antd';
+import React from 'react';
 declare const BasicTable: (props: TableProps<any>) => React.JSX.Element;
 export default BasicTable;

package/es/components/table/BasicTable/index.js

@@ -14,13 +14,13 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { Table, Form } from "antd";
-import React, { useState, useMemo, useCallback, useEffect } from "react";
+import { Table, Form } from 'antd';
+import React, { useState, useMemo, useCallback, useEffect } from 'react';
 import { FormPagination } from "../../Pagination";
 import { calcFilterSort } from "../Table/utils";
 import { useSharedState } from "../../../hooks";
 import { Context } from "../model";
-import { isArr } from "@pisell/utils";
+import { isArr } from '@pisell/utils';
 var BasicTable = function BasicTable(props) {
   var _pagination$pageSizeO;
   var dataSource = props.dataSource,
@@ -37,11 +37,11 @@ var BasicTable = function BasicTable(props) {
     sort = _useState4[0],
     setSort = _useState4[1];
   var form = Form.useFormInstance();
-  var formPagination = Form.useWatch("pagination", form) || {
+  var formPagination = Form.useWatch('pagination', form) || {
     page: 1,
     size: 10
   };
-  var group = Form.useWatch("group_by", {
+  var group = Form.useWatch('group_by', {
     form: form,
     preserve: true
   });
@@ -96,22 +96,36 @@ var BasicTable = function BasicTable(props) {
     var _expandedRowKeys = [];
     _dataSource === null || _dataSource === void 0 ? void 0 : (_dataSource$list = _dataSource.list) === null || _dataSource$list === void 0 ? void 0 : _dataSource$list.forEach(function (item) {
       if (item.__is_group) {
-        _expandedRowKeys.push(item["__rowKey"]);
+        _expandedRowKeys.push(item['__rowKey']);
       }
     });
     return _expandedRowKeys;
   }, [_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list]);
   useEffect(function () {
     dispatch({
-      type: "setCurrentDataSource",
+      type: 'setCurrentDataSource',
       payload: (_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list) || []
     });
   }, [_dataSource === null || _dataSource === void 0 ? void 0 : _dataSource.list]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Table, _extends({
-    key: defaultExpandedRowKeys.join("-")
+    key: defaultExpandedRowKeys.join('-')
   }, other, {
     // 开启分组条件后关闭行选择功能
-    rowSelection: isGroup ? false : other === null || other === void 0 ? void 0 : other.rowSelection,
+    rowSelection: isGroup ? false : _objectSpread(_objectSpread({}, other === null || other === void 0 ? void 0 : other.rowSelection), {}, {
+      getCheckboxProps: function getCheckboxProps() {
+        return {
+          children:
+          /*#__PURE__*/
+          // 热区为单元格大小
+          React.createElement("div", {
+            className: "pisell-lowcode-table-checkbox"
+          }),
+          onClick: function onClick(e) {
+            e.stopPropagation();
+          }
+        };
+      }
+    }),
     virtual: virtual,
     onChange: function onChange(pagination, filters, sorter) {
       form.setFieldsValue({
@@ -129,7 +143,7 @@ var BasicTable = function BasicTable(props) {
       return _objectSpread(_objectSpread({}, (other === null || other === void 0 ? void 0 : (_other$onRow = other.onRow) === null || _other$onRow === void 0 ? void 0 : _other$onRow.call(other, record, index)) || {}), {}, {
         __is_group: record.__is_group,
         __is_drag_sort: other.dragSort,
-        className: record.__is_group ? "pisell-lowcode-table-group-row-wrap" : ""
+        className: record.__is_group ? 'pisell-lowcode-table-group-row-wrap' : ''
       });
     },
     expandable: {

package/es/components/table/Table/index.less

@@ -15,6 +15,22 @@
       margin-top: 12px;
     }
   }
+
+  .pisell-lowcode-table-checkbox{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
+
+  .pisell-lowcode-table-tbody{
+    .pisell-lowcode-table-selection-column{
+      .pisell-lowcode-checkbox{
+        left: 8px!important;
+      }
+    }
+  }
 }
 
 .materials-grid-table-wrap {

package/es/components/table/index.less

@@ -29,9 +29,6 @@
         display: flex;
         align-items: center;
         justify-content: center;
-        position: absolute;
-        top: 0;
-        left: 0;
       }
     }
   }
@@ -45,9 +42,6 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      position: absolute;
-      top: 0;
-      left: 0;
     }
   }
 
@@ -132,9 +126,11 @@
 
   .pisell-lowcode-table-bordered .pisell-lowcode-table-tbody .pisell-lowcode-table-selection-column {
     border-left: 1px solid #EAECF0;
+    min-width: 46px;
   }
 
   .drag-sort-cell {
+    min-width: 40px;
     .editable-cell-value-wrap {
       display: flex;
       align-items: center;

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

@@ -48,6 +48,7 @@ var import_function = require("./components/ExportTable/function");
 var import_ImportLog = __toESM(require("./components/ImportLog"));
 var import_ImportTable = __toESM(require("./components/ImportTable"));
 var import_hooks = require("../../../../../hooks");
+var import_locale = require("../../../../../utils/locale");
 var import_model = require("../../../model");
 var import_index = require("./index.less");
 var Com = {
@@ -57,6 +58,7 @@ var Com = {
   import_log: import_ImportLog.default
 };
 var ExportImport = ({ exportImport }) => {
+  var _a, _b;
   const [open, setOpen] = (0, import_react.useState)(false);
   const [file, setFile] = (0, import_react.useState)(null);
   const [type, setType] = (0, import_react.useState)(import_status.defaultOptions.exportType);
@@ -65,7 +67,7 @@ var ExportImport = ({ exportImport }) => {
   const { state } = (0, import_hooks.useSharedState)(import_model.Context);
   const { originResultDataSource, currentDataSource } = state;
   const context = (0, import_useEngineContext.default)();
-  import_utils.request.setRequest(context.appHelper.utils.request);
+  import_utils.request.setRequest((_b = (_a = context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.request);
   const _items = (0, import_react.useMemo)(() => {
     const result = Object.entries(import_status.exportImportOptions).map(([key, value2]) => {
       return {
@@ -76,10 +78,9 @@ var ExportImport = ({ exportImport }) => {
     return result;
   }, []);
   const Content = (0, import_react.useMemo)(() => {
-    if (!value)
-      return null;
-    return Com[value];
-  }, [value]);
+    const _value = value || import_status.defaultOptions.importValue;
+    return Com[_value];
+  }, [value, import_status.defaultOptions.importValue]);
   const _footer = (0, import_react.useMemo)(() => {
     const types = import_status.defaultOptions.footerHintTypes;
     if (types.includes(value)) {
@@ -94,8 +95,10 @@ var ExportImport = ({ exportImport }) => {
     if (!value)
       return null;
     const types = import_status.defaultOptions.okShowButtonTypes;
+    const lang = (0, import_locale.getCurrentLocale)();
+    const isEn = lang === "en-US" || lang === "en";
     if (types.includes(value) && (exportImport == null ? void 0 : exportImport.title)) {
-      return `${import_status.exportImportOptions[value]}${exportImport.title}`;
+      return `${import_status.exportImportOptions[value]}${isEn ? " " : ""}${exportImport.title}`;
     }
     return import_status.exportImportOptions[value];
   }, [value, exportImport == null ? void 0 : exportImport.title]);

package/lib/components/table/BasicTable/index.d.ts

@@ -1,4 +1,4 @@
-import { TableProps } from "antd";
-import React from "react";
+import { TableProps } from 'antd';
+import React from 'react';
 declare const BasicTable: (props: TableProps<any>) => React.JSX.Element;
 export default BasicTable;

package/lib/components/table/BasicTable/index.js

@@ -117,7 +117,20 @@ var BasicTable = (props) => {
     {
       key: defaultExpandedRowKeys.join("-"),
       ...other,
-      rowSelection: isGroup ? false : other == null ? void 0 : other.rowSelection,
+      rowSelection: isGroup ? false : {
+        ...other == null ? void 0 : other.rowSelection,
+        getCheckboxProps: () => {
+          return {
+            children: (
+              // 热区为单元格大小
+              /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-table-checkbox" })
+            ),
+            onClick: (e) => {
+              e.stopPropagation();
+            }
+          };
+        }
+      },
       virtual,
       onChange: (pagination2, filters, sorter) => {
         form.setFieldsValue({

package/lib/components/table/Table/index.less

@@ -15,6 +15,22 @@
       margin-top: 12px;
     }
   }
+
+  .pisell-lowcode-table-checkbox{
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+  }
+
+  .pisell-lowcode-table-tbody{
+    .pisell-lowcode-table-selection-column{
+      .pisell-lowcode-checkbox{
+        left: 8px!important;
+      }
+    }
+  }
 }
 
 .materials-grid-table-wrap {

package/lib/components/table/index.less

@@ -29,9 +29,6 @@
         display: flex;
         align-items: center;
         justify-content: center;
-        position: absolute;
-        top: 0;
-        left: 0;
       }
     }
   }
@@ -45,9 +42,6 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      position: absolute;
-      top: 0;
-      left: 0;
     }
   }
 
@@ -132,9 +126,11 @@
 
   .pisell-lowcode-table-bordered .pisell-lowcode-table-tbody .pisell-lowcode-table-selection-column {
     border-left: 1px solid #EAECF0;
+    min-width: 46px;
   }
 
   .drag-sort-cell {
+    min-width: 40px;
     .editable-cell-value-wrap {
       display: flex;
       align-items: center;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.321",
+  "version": "1.0.322",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -63,8 +63,8 @@
     "react-virtualized-auto-sizer": "^1.0.20",
     "crypto-js": "^4.2.0",
     "@pisell/utils": "1.0.27",
-    "@pisell/icon": "0.0.10",
-    "@pisell/date-picker": "1.0.75"
+    "@pisell/date-picker": "1.0.75",
+    "@pisell/icon": "0.0.10"
   },
   "peerDependencies": {
     "react": "^18.0.0",