@lemon-fe/components 1.4.22-alpha.1 → 1.4.22-alpha.2

package/es/data-grid/components/custom-panel/field-modal.js

@@ -173,17 +173,42 @@ export default function FieldModal(props) {
     form: form
   }, /*#__PURE__*/React.createElement(FormLayout, {
     direction: "column",
-    layout: "flex"
+    layout: "flex",
+    labelWidth: 106
   }, /*#__PURE__*/React.createElement(Form.Item, {
     hidden: true,
     name: "id"
   }, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
-    label: fieldModal.customColumnNameText,
-    name: "name",
-    rules: [{
-      required: true
-    }]
-  }, /*#__PURE__*/React.createElement(Input, null)), /*#__PURE__*/React.createElement(Form.Item, {
+    noStyle: true,
+    dependencies: ['groupId']
+  }, function (_ref2) {
+    var getFieldValue = _ref2.getFieldValue;
+    var groupId = getFieldValue('groupId');
+    return /*#__PURE__*/React.createElement(Form.Item, {
+      label: /*#__PURE__*/React.createElement("span", null, fieldModal.customColumnNameText, /*#__PURE__*/React.createElement(TipMark, {
+        infoContent: fieldModal.idTooltip
+      })),
+      name: "name",
+      rules: [{
+        required: true,
+        message: fieldModal.customColumnNameTextRequired
+      }, {
+        validator: function validator(_, val) {
+          var _groups$find;
+          if (groupId ? (_groups$find = groups.find(function (item) {
+            return item.groupId === groupId;
+          })) === null || _groups$find === void 0 || (_groups$find = _groups$find.children) === null || _groups$find === void 0 ? void 0 : _groups$find.some(function (item) {
+            return item.headerName === val;
+          }) : nodes.some(function (item) {
+            return item.title === val;
+          })) {
+            return Promise.reject(new Error(fieldModal.idTooltip));
+          }
+          return Promise.resolve();
+        }
+      }]
+    }, /*#__PURE__*/React.createElement(Input, null));
+  }), /*#__PURE__*/React.createElement(Form.Item, {
     label: fieldModal.customColumnParentHeaderText,
     name: "groupId"
   }, /*#__PURE__*/React.createElement(Select, {

package/es/data-grid/locale/en_US.js

@@ -38,7 +38,9 @@ var locale = {
     summaryTypeContentText: "\n      <div>\n        <p>1. The sum of custom column data values to get the total value</p>\n        <p>\n          2. The total value is calculated based on a formula from the data source (this total value is not available for export)\n          <br />\n          The total value of the field columns added to the formula is calculated based on the formula to derive the custom column total. This is typically used when the custom column represents a percentage, such as gross margin percentage\n        </p>\n      </div>\n      ",
     customSummaryDataText: 'Sum of custom column data values to get the total value',
     dataSourceSummaryDataText: 'Total value calculated based on the formula from the data source',
-    addFieldText: 'Add Field'
+    addFieldText: 'Add Field',
+    idTooltip: 'Custom column name is not allowed to be the same as the existing field, if the history has been set with the same name field, it does not support export',
+    customColumnNameTextRequired: 'Please enter the custom column name'
   },
   maxWordText: '${headerName} can not exceed ${maxLength} words',
   operationSuccessText: 'Success',

package/es/data-grid/locale/locale.d.ts

@@ -18,6 +18,8 @@ export interface DataGridLocale {
         customSummaryDataText: string;
         dataSourceSummaryDataText: string;
         addFieldText: string;
+        idTooltip: string;
+        customColumnNameTextRequired: string;
     };
     maxWordText: string;
     operationSuccessText: string;

package/es/data-grid/locale/vi.js

@@ -35,7 +35,9 @@ var locale = {
     summaryTypeContentText: "\n    <div>\n      <p>1. T\xEDnh t\u1ED5ng gi\xE1 tr\u1ECB d\u1EEF li\u1EC7u c\u1EE7a c\u1ED9t t\xF9y ch\u1EC9nh \u0111\u1EC3 c\xF3 \u0111\u01B0\u1EE3c gi\xE1 tr\u1ECB t\u1ED5ng c\u1ED9ng.</p>\n      <p>\n        2. Gi\xE1 tr\u1ECB t\u1ED5ng \u0111\u01B0\u1EE3c t\xEDnh to\xE1n t\u1EEB ngu\u1ED3n d\u1EEF li\u1EC7u d\u1EF1a tr\xEAn c\xF4ng th\u1EE9c t\xEDnh (gi\xE1 tr\u1ECB t\u1ED5ng n\xE0y kh\xF4ng h\u1ED7 tr\u1EE3 xu\u1EA5t).\n        <br />\n        Gi\xE1 tr\u1ECB t\u1ED5ng c\u1EE7a c\xE1c c\u1ED9t d\u1EEF li\u1EC7u \u0111\u01B0\u1EE3c th\xEAm v\xE0o c\xF4ng th\u1EE9c \u0111\u01B0\u1EE3c t\xEDnh to\xE1n theo c\xF4ng th\u1EE9c \u0111\u1EC3 ra gi\xE1 tr\u1ECB t\u1ED5ng c\u1EE7a c\u1ED9t t\xF9y ch\u1EC9nh, th\u01B0\u1EDDng \u0111\u01B0\u1EE3c \xE1p d\u1EE5ng khi c\u1ED9t t\xF9y ch\u1EC9nh l\xE0 t\u1EF7 l\u1EC7 ph\u1EA7n tr\u0103m, ch\u1EB3ng h\u1EA1n nh\u01B0 t\u1EF7 su\u1EA5t l\u1EE3i nhu\u1EADn g\u1ED9p.\n      </p>\n    </div>\n    ",
     customSummaryDataText: 'Tính tổng giá trị dữ liệu của cột tùy chỉnh để có được giá trị tổng cộng',
     dataSourceSummaryDataText: 'Nguồn dữ liệu tính toán giá trị tổng cộng theo công thức tính toán',
-    addFieldText: 'Thêm trường'
+    addFieldText: 'Thêm trường',
+    idTooltip: 'Tên cột tùy chỉnh không được trùng với tên cột đã có, nếu cột đã có tên trùng đã được thiết lập thì không hỗ trợ xuất',
+    customColumnNameTextRequired: 'Vui lòng nhập tên cột tùy chỉnh'
   },
   validate: {
     fieldErrorText: 'Nhập sai trường ${field}'

package/es/data-grid/locale/zh_CN.js

@@ -35,7 +35,9 @@ var locale = {
     summaryTypeContentText: "\n    <div>\n      <p>1\u3001\u81EA\u5B9A\u4E49\u5217\u6570\u636E\u503C\u6C42\u548C\u5F97\u51FA\u5408\u8BA1\u503C</p>\n      <p>\n        2\u3001\u6570\u636E\u6E90\u6839\u636E\u8BA1\u7B97\u516C\u5F0F\u5F97\u51FA\u5408\u8BA1\u503C(\u8BE5\u5408\u8BA1\u503C\u4E0D\u652F\u6301\u5BFC\u51FA)\n        <br />\n        \u516C\u5F0F\u4E2D\u6DFB\u52A0\u7684\u5B57\u6BB5\u5217\u6570\u636E\u5408\u8BA1\u503C\u6309\u8BA1\u7B97\u516C\u5F0F\u7B97\u51FA\u81EA\u5B9A\u4E49\u5217\u5408\u8BA1\u503C\uFF0C\u4E00\u822C\u7528\u4E8E\u81EA\u5B9A\u4E49\u5217\u662F\u767E\u5206\u6BD4\u7684\u60C5\u51B5\uFF0C\u6BD4\u5982\u6BDB\u5229\u7387\n      </p>\n    </div>\n    ",
     customSummaryDataText: '自定义列数据值求和得出合计值',
     dataSourceSummaryDataText: '数据源根据计算公式得出合计值',
-    addFieldText: '添加字段'
+    addFieldText: '添加字段',
+    idTooltip: '自定义列名不允许和已有字段重复，如果历史已经设置的重名字段不支持导出',
+    customColumnNameTextRequired: '请输入自定义列名'
   },
   validate: {
     fieldErrorText: '${field}输入错误'

package/es/data-grid/locale/zh_Hant_HK.js

@@ -35,7 +35,9 @@ var locale = {
     summaryTypeContentText: "\n    <div>\n      <p>1\u3001\u81EA\u5B9A\u7FA9\u5217\u6578\u64DA\u503C\u6C42\u548C\u5F97\u51FA\u5408\u8A08\u503C</p>\n      <p>\n        2\u3001\u6578\u64DA\u6E90\u6839\u64DA\u8A08\u7B97\u516C\u5F0F\u5F97\u51FA\u7E3D\u8A08\u503C(\u8A72\u7E3D\u8A08\u503C\u4E0D\u652F\u63F4\u5C0E\u51FA)\n        <br />\n        \u516C\u5F0F\u4E2D\u6DFB\u52A0\u7684\u5B57\u6BB5\u5217\u6578\u64DA\u7E3D\u8A08\u503C\u6703\u6309\u8A08\u7B97\u516C\u5F0F\u5F97\u51FA\u81EA\u5B9A\u7FA9\u5217\u7684\u7E3D\u8A08\u503C\uFF0C\u6B64\u65B9\u6CD5\u901A\u5E38\u7528\u65BC\u81EA\u5B9A\u7FA9\u5217\u70BA\u767E\u5206\u6BD4\u7684\u60C5\u6CC1\uFF0C\u4F8B\u5982\u6BDB\u5229\u7387\n      </p>\n    </div>\n    ",
     customSummaryDataText: '自定義列數據值求和得出合計值',
     dataSourceSummaryDataText: '數據源根據計算公式得出合計值',
-    addFieldText: '添加字段'
+    addFieldText: '添加字段',
+    idTooltip: '自定義列名不允許與已有字段重複，如果歷史已經設置的重名字段不支持導出',
+    customColumnNameTextRequired: '請輸入自定義列名'
   },
   validate: {
     fieldErrorText: '${field}輸入錯誤'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lemon-fe/components",
-  "version": "1.4.22-alpha.1",
+  "version": "1.4.22-alpha.2",
   "description": "> TODO: description",
   "homepage": "",
   "license": "MIT",
@@ -58,5 +58,5 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
-  "gitHead": "cd26a96e874a81673af79672cb2d3cc06ae48069"
+  "gitHead": "b558090241f16b9e2be6079f6d8a8fad1e212cb7"
 }