@luck-design-biz/luckda 0.0.25-7 → 0.0.25-8

package/lib/lowcode/painter/components/field-setting/SettingUI.js

@@ -6,7 +6,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
@@ -21,6 +24,7 @@ var _WidthHeight = _interopRequireDefault(require("../../panel-section/WidthHeig
 var _FieldAttrsModal = _interopRequireDefault(require("./FieldAttrsModal"));
 var _FieldRulesModal = _interopRequireDefault(require("./FieldRulesModal"));
 var _apiUrl = require("../../../constants/api-url");
+var _frontRules = require("./meta/frontRules");
 var _constants = require("../../../constants");
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.fieldsSetting';
 var _ALIGN_OPTIONS_ = [{
@@ -108,12 +112,16 @@ var SettingUI = function SettingUI(_ref) {
     setRules = _useState6[1];
   var _useState7 = (0, _react.useState)(null),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    condition = _useState8[0],
-    setCondition = _useState8[1];
+    frontRules = _useState8[0],
+    setFrontRules = _useState8[1];
   var _useState9 = (0, _react.useState)(null),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    optionalFields = _useState10[0],
-    setOptionalFields = _useState10[1];
+    condition = _useState10[0],
+    setCondition = _useState10[1];
+  var _useState11 = (0, _react.useState)(null),
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+    optionalFields = _useState12[0],
+    setOptionalFields = _useState12[1];
   var fieldData = isBatch ? {} : data;
   var _useRequest = (0, _ahooks.useRequest)(_apiUrl.fetchFieldCondition, {
       defaultParams: [{
@@ -139,20 +147,37 @@ var SettingUI = function SettingUI(_ref) {
       }],
       ready: !isBatch,
       refreshDeps: [fieldData.datasetFieldUid],
-      onSuccess: function onSuccess(_ref4) {
+      onSuccess: function onSuccess(_ref4, _ref5) {
         var code = _ref4.code,
           list = _ref4.list,
           detail = _ref4.detail;
+        var _ref6 = (0, _slicedToArray2.default)(_ref5, 1),
+          verifyScope = _ref6[0].verifyScope;
         if (code === 1) {
           var _detail$list$;
-          setRules((_detail$list$ = detail[list[0]]) === null || _detail$list$ === void 0 ? void 0 : _detail$list$.ccmModuleFieldVerifies);
+          var _data = (_detail$list$ = detail[list[0]]) === null || _detail$list$ === void 0 ? void 0 : _detail$list$.ccmModuleFieldVerifies;
+          if ((0, _lodash.isNil)(verifyScope)) {
+            var dataByGroup = (0, _lodash.groupBy)(_data, 'verifyScope');
+            setRules(dataByGroup[1]);
+            setFrontRules(dataByGroup[0]);
+          } else if (verifyScope === 0) setFrontRules(_data);else if (verifyScope === 1) setRules(_data);
         }
       }
     }),
+    rulesParams = _useRequest2.params,
     rulesLoading = _useRequest2.loading,
-    rulesRefresh = _useRequest2.refresh;
-  var handleFieldRulesModalClose = (0, _ahooks.useMemoizedFn)(function (success) {
-    success && rulesRefresh();
+    rulesRun = _useRequest2.run;
+  var rulesRefresh = function rulesRefresh() {
+    var newParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    return rulesRun((0, _objectSpread2.default)((0, _objectSpread2.default)({}, rulesParams[0]), newParams));
+  };
+  var propertyRules = (0, _ahooks.useCreation)(function () {
+    return (0, _lodash.keyBy)((0, _frontRules.getFrontRules)(fieldData.property), 'key');
+  }, [fieldData]);
+  var handleFieldRulesModalClose = (0, _ahooks.useMemoizedFn)(function (success, verifyScope) {
+    success && rulesRefresh({
+      verifyScope: verifyScope
+    });
     setRule(null);
   });
   var renderCodeIcon = (0, _ahooks.useMemoizedFn)(function (_stateItem, _scope) {
@@ -178,6 +203,55 @@ var SettingUI = function SettingUI(_ref) {
       }
     })));
   });
+  var handleDelete = (0, _ahooks.useMemoizedFn)( /*#__PURE__*/function () {
+    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(uid, verifyScope) {
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _antd.Modal.confirm({
+              title: (0, _utils.formatMessage)({
+                id: 'luckda.lowcode.painter.delete.tip',
+                label: '确定删除吗？'
+              }),
+              getContainer: function getContainer() {
+                return document.getElementById('lc-design-workspace');
+              },
+              zIndex: 1001,
+              onOk: function () {
+                var _onOk = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+                  var success;
+                  return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                        _context.next = 2;
+                        return run('delRule', uid);
+                      case 2:
+                        success = _context.sent;
+                        if (success) rulesRefresh({
+                          verifyScope: verifyScope
+                        });
+                      case 4:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee);
+                }));
+                function onOk() {
+                  return _onOk.apply(this, arguments);
+                }
+                return onOk;
+              }()
+            });
+          case 1:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function (_x, _x2) {
+      return _ref7.apply(this, arguments);
+    };
+  }());
   return /*#__PURE__*/_react.default.createElement(_antd.Spin, {
     spinning: _loading || loading || rulesLoading
   }, !isBatch ? /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
@@ -191,7 +265,7 @@ var SettingUI = function SettingUI(_ref) {
     onChange: function onChange(e) {
       return onAliasChange(fieldData, e.target.value);
     }
-  })) : null, (component === 'table' || component === 'tableForm') && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+  })) : null, ['table', 'tableForm'].includes(component) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".width"),
       label: '列宽'
@@ -335,15 +409,15 @@ var SettingUI = function SettingUI(_ref) {
       id: "".concat(_I18N_PREFIX_, ".required"),
       label: '是否必填'
     })
-  }, renderCodeIcon(fieldRequired, _constants.FIELD_SCOPES.FIELD_REQUIRED)), 'table' === component && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+  }, renderCodeIcon(fieldRequired, _constants.FIELD_SCOPES.FIELD_REQUIRED)), ['table', 'tableForm'].includes && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({
-      id: "".concat(_I18N_PREFIX_, ".display"),
-      label: '是否显示'
+      id: "".concat(_I18N_PREFIX_, ".table.display"),
+      label: '表格中显示'
     })
-  }, renderCodeIcon(fieldTable, _constants.FIELD_SCOPES.FIELD_TABLE_DISPLAY)), 'form' === component && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+  }, renderCodeIcon(fieldTable, _constants.FIELD_SCOPES.FIELD_TABLE_DISPLAY)), ['form', 'tableForm'].includes(component) && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({
-      id: "".concat(_I18N_PREFIX_, ".display"),
-      label: '是否显示'
+      id: "".concat(_I18N_PREFIX_, ".form.display"),
+      label: '表单中显示'
     })
   }, renderCodeIcon(fieldForm, _constants.FIELD_SCOPES.FIELD_FORM_DISPLAY)), /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({
@@ -370,7 +444,61 @@ var SettingUI = function SettingUI(_ref) {
   }), "\n              \u3010").concat(fieldDefaultValue.expression, "\u3011") : (0, _utils.formatMessage)({
     id: 'luckda.lowcode.painter.setting',
     label: '设置'
-  }))) : null, !isBatch ? /*#__PURE__*/_react.default.createElement(_Collapse.default, {
+  }))) : null, !isBatch ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Collapse.default, {
+    label: (0, _utils.formatMessage)({
+      id: "".concat(_I18N_PREFIX_, ".rules.front"),
+      label: '前端校验规则'
+    }),
+    bodyStyle: {
+      padding: '12px 16px'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_ListEditor.ListEditor, {
+    addText: (0, _utils.formatMessage)({
+      id: "".concat(_I18N_PREFIX_, ".addRules"),
+      label: '添加校验规则'
+    }),
+    handleAdd: function handleAdd() {
+      return setRule({
+        ruleType: 'front'
+      });
+    }
+  }, frontRules === null || frontRules === void 0 ? void 0 : frontRules.map(function (_rule) {
+    return /*#__PURE__*/_react.default.createElement(_ListEditor.ListEditorItem, {
+      left: /*#__PURE__*/_react.default.createElement("span", null, propertyRules[_rule.verifyType].label),
+      right: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+        title: (0, _utils.formatMessage)({
+          id: 'luckda.lowcode.painter.edit',
+          label: '编辑'
+        })
+      }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+        type: "edit",
+        style: {
+          marginRight: '8px',
+          cursor: 'pointer'
+        },
+        onClick: function onClick() {
+          return setRule((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _rule), {}, {
+            ruleType: 'front'
+          }));
+        }
+      })), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+        title: (0, _utils.formatMessage)({
+          id: 'luckda.lowcode.painter.delete',
+          label: '删除'
+        })
+      }, /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+        type: "delete",
+        style: {
+          cursor: 'pointer'
+        },
+        onClick: function onClick() {
+          return handleDelete(_rule.uid, 0);
+        }
+      }))),
+      item: _rule,
+      sortable: false
+    });
+  }))), /*#__PURE__*/_react.default.createElement(_Collapse.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".rules"),
       label: '校验规则'
@@ -384,7 +512,9 @@ var SettingUI = function SettingUI(_ref) {
       label: '添加校验规则'
     }),
     handleAdd: function handleAdd() {
-      return setRule({});
+      return setRule({
+        ruleType: 'back'
+      });
     }
   }, rules === null || rules === void 0 ? void 0 : rules.map(function (_rule) {
     return /*#__PURE__*/_react.default.createElement(_ListEditor.ListEditorItem, {
@@ -401,7 +531,9 @@ var SettingUI = function SettingUI(_ref) {
           cursor: 'pointer'
         },
         onClick: function onClick() {
-          return setRule(_rule);
+          return setRule((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _rule), {}, {
+            ruleType: 'back'
+          }));
         }
       })), /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
         title: (0, _utils.formatMessage)({
@@ -414,13 +546,13 @@ var SettingUI = function SettingUI(_ref) {
           cursor: 'pointer'
         },
         onClick: function onClick() {
-          return run('delRule', _rule.uid);
+          return handleDelete(_rule.uid, 1);
         }
       }))),
       item: _rule,
       sortable: false
     });
-  }))) : null, /*#__PURE__*/_react.default.createElement(_FieldAttrsModal.default, {
+  })))) : null, /*#__PURE__*/_react.default.createElement(_FieldAttrsModal.default, {
     dataModelKey: dataModelKey,
     datasetId: datasetId,
     moduleId: moduleId,

package/lib/lowcode/painter/components/field-setting/index.js

@@ -218,88 +218,57 @@ var FieldSetting = function FieldSetting(_ref) {
     }),
     runDebounce = _useDebounceFn.run;
   var run = (0, _ahooks.useMemoizedFn)( /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(key, val) {
-      var mapping, _stateItem, request, c, d, _yield$request, code;
-      return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(key, val) {
+      var _yield$fetchDelAttrs, code, mapping, _stateItem, request, c, d, _yield$request, _code;
+      return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!(key === 'isEqual')) {
-              _context2.next = 5;
+              _context.next = 5;
               break;
             }
-            _context2.next = 3;
+            _context.next = 3;
             return runFetchUpdateUniqueField((0, _defineProperty2.default)({
               moduleDatasetUid: datasetId,
               moduleUid: moduleId
             }, val ? 'uniqueFieldUid' : 'noUniqueFieldUid', fieldData.uid));
           case 3:
-            _context2.next = 30;
+            _context.next = 34;
             break;
           case 5:
             if (!(key === 'align' || key === 'headerAlign' || key === 'pinned' || key === 'tip')) {
-              _context2.next = 9;
+              _context.next = 9;
               break;
             }
             handleUIChange(key, val);
-            _context2.next = 30;
+            _context.next = 34;
             break;
           case 9:
             if (!(key === 'col' || key === 'row')) {
-              _context2.next = 13;
+              _context.next = 13;
               break;
             }
             handleUIChange(key, val);
-            _context2.next = 30;
+            _context.next = 34;
             break;
           case 13:
             if (!(key === 'delRule')) {
-              _context2.next = 17;
+              _context.next = 21;
               break;
             }
-            _antd.Modal.confirm({
-              title: (0, _utils.formatMessage)({
-                id: 'luckda.lowcode.painter.delete.tip',
-                label: '确定删除吗？'
-              }),
-              getContainer: function getContainer() {
-                return document.getElementById('lc-design-workspace');
-              },
-              zIndex: 1001,
-              onOk: function () {
-                var _onOk = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
-                  var _yield$fetchDelAttrs, code;
-                  return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
-                    while (1) switch (_context.prev = _context.next) {
-                      case 0:
-                        _context.next = 2;
-                        return (0, _apiUrl.fetchDelAttrs)({
-                          moduleDatasetUid: fieldData.datasetFieldUid,
-                          ccmModuleFieldVerifies: [{
-                            uid: val
-                          }],
-                          scope: _constants.FIELD_SCOPES.CHECK_RULES
-                        });
-                      case 2:
-                        _yield$fetchDelAttrs = _context.sent;
-                        code = _yield$fetchDelAttrs.code;
-                        if (code === 1) {
-                          rulesRefresh();
-                        }
-                      case 5:
-                      case "end":
-                        return _context.stop();
-                    }
-                  }, _callee);
-                }));
-                function onOk() {
-                  return _onOk.apply(this, arguments);
-                }
-                return onOk;
-              }()
+            _context.next = 16;
+            return (0, _apiUrl.fetchDelAttrs)({
+              moduleDatasetUid: fieldData.datasetFieldUid,
+              ccmModuleFieldVerifies: [{
+                uid: val
+              }],
+              scope: _constants.FIELD_SCOPES.CHECK_RULES
             });
-            _context2.next = 30;
-            break;
-          case 17:
+          case 16:
+            _yield$fetchDelAttrs = _context.sent;
+            code = _yield$fetchDelAttrs.code;
+            return _context.abrupt("return", code === 1);
+          case 21:
             mapping = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants.FIELD_SCOPES.FIELD_REQUIRED, {
               key: 'fieldRequired',
               refresh: requiredRefresh
@@ -335,19 +304,19 @@ var FieldSetting = function FieldSetting(_ref) {
             if (!_stateItem) {
               d.datasetBusinessUids = [fieldData.uid];
             }
-            _context2.next = 27;
+            _context.next = 31;
             return request(d);
-          case 27:
-            _yield$request = _context2.sent;
-            code = _yield$request.code;
-            if (code === 1) {
+          case 31:
+            _yield$request = _context.sent;
+            _code = _yield$request.code;
+            if (_code === 1) {
               mapping[key].refresh();
             }
-          case 30:
+          case 34:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2);
+      }, _callee);
     }));
     return function (_x, _x2) {
       return _ref8.apply(this, arguments);

package/lib/lowcode/painter/components/field-setting/meta/frontRules.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getFrontRules = void 0;
+var getFrontRules = exports.getFrontRules = function getFrontRules(property) {
+  var rules = [];
+  switch (property) {
+    case 'number':
+    case 'money':
+    case 'decimal':
+    case 'sint':
+      rules = [{
+        label: '最小值',
+        key: 'min',
+        defaultCode: "function min(cValue) { \n return 0; // 返回数字 \n}"
+      }, {
+        label: '最大值',
+        key: 'max',
+        defaultCode: "function max(cValue) { \n return 100; // 返回数字 \n}"
+      }];
+      break;
+    case 'string':
+      rules = [{
+        label: '长度',
+        key: 'length',
+        defaultCode: "function length(cValue) { \n return 100; // 返回数字 \n}"
+      }, {
+        label: '邮箱',
+        key: 'email',
+        noCode: true
+      }, {
+        label: '身份证',
+        key: 'idcard',
+        noCode: true
+      }, {
+        label: '手机号码',
+        key: 'mobile',
+        noCode: true
+      }];
+      break;
+    case 'text':
+      rules = [{
+        label: '长度',
+        key: 'length',
+        defaultCode: "function length(cValue) { \n return 100; // 返回数字 \n}"
+      }];
+      break;
+    default:
+      ;
+  }
+  rules.push({
+    label: '自定义',
+    key: 'rules',
+    defaultCode: "function validator(cValue, rule, value, callback) { \n if(!value) callback('errorMsg'); \n callback(); \n}"
+  });
+  return rules;
+};

package/lib/lowcode/painter/panel-section/BlocksEditor/index.js

@@ -55,13 +55,10 @@ var BlockEditor = function BlockEditor(_ref) {
     nodeId = _ref.nodeId,
     renderPanelItems = _ref.renderPanelItems,
     innerProps = _ref.innerProps;
-  var node = (0, _ContextProvider.useGet)({
-    id: nodeId
+  var blocks = (0, _ContextProvider.useGet)({
+    id: nodeId,
+    path: 'props.blocks'
   });
-  var _ref2 = node || {
-      props: {}
-    },
-    blocks = _ref2.props.blocks;
   var handleAddBlock = (0, _ahooks.useMemoizedFn)(function (type) {
     var _id = "block_".concat((0, _utils.suid)());
     var newData = (0, _lodash.concat)(blocks, (0, _objectSpread2.default)((0, _objectSpread2.default)({
@@ -119,8 +116,8 @@ var BlockEditor = function BlockEditor(_ref) {
   });
   var menu = (0, _ahooks.useCreation)(function () {
     return /*#__PURE__*/_react.default.createElement(_antd.Menu, {
-      onClick: function onClick(_ref3) {
-        var key = _ref3.key;
+      onClick: function onClick(_ref2) {
+        var key = _ref2.key;
         return handleAddBlock(key);
       }
     }, addOptions.map(function (opt) {
@@ -213,7 +210,7 @@ var BlockEditor = function BlockEditor(_ref) {
       cloneP.valueKey = "blocks[".concat(i + 1, "].").concat(p.key);
       if (p.key === 'dataset') {
         if ((0, _lodash.includes)(['auto', 'grid', 'writer'], blockItem.type)) {
-          if (blockItem.type !== 'auto') cloneP.next.props[0].component = "tableForm";
+          if (blockItem.type !== 'auto') cloneP.next.props[0].component = 'tableForm';
           var _valueKey = "blocks[".concat(i + 1, "].fields");
           cloneP.next.props[0].valueKey = _valueKey;
           cloneP.beforeChangeKey = _valueKey;

package/lib/lowcode/painter/panel-section/FieldsSetting.js

@@ -1,11 +1,12 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -23,8 +24,9 @@ var _BatchSetting = _interopRequireDefault(require("../components/field-setting/
 var _apiUrl = require("../../constants/api-url");
 var _helper = require("../../engine/tools/helper");
 var _fieldsSetting = _interopRequireDefault(require("../style/fields-setting.less"));
+var _excluded = ["fieldAliasName"];
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.fieldsSetting';
-var _PICK_KEYS_ = ['id', 'uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip', 'col', 'row', 'note', 'placeholder', 'fieldAliasName'];
+var _PICK_KEYS_ = ['id', 'uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip', 'col', 'row', 'note', 'placeholder', 'aliasName'];
 var Header = _styledComponents.default.div.withConfig({
   displayName: "Header",
   componentId: "luckda-6530__sc-gcwvp1-0"
@@ -54,17 +56,31 @@ var FieldsSetting = function FieldsSetting(_ref) {
     checkedFields = _useMap2[0],
     _useMap2$ = _useMap2[1],
     set = _useMap2$.set,
-    remove = _useMap2$.remove;
+    get = _useMap2$.get,
+    setAll = _useMap2$.setAll,
+    remove = _useMap2$.remove,
+    reset = _useMap2$.reset;
   var _useState3 = (0, _react.useState)(void 0),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     drawerType = _useState4[0],
     setDrawerType = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    checkAll = _useState6[0],
+    setCheckAll = _useState6[1];
   var fieldData = (0, _ahooks.useCreation)(function () {
     return fields.find(function (_ref2) {
       var uid = _ref2.uid;
       return uid === fieldId;
     });
   }, [fieldId, fields]);
+  (0, _ahooks.useUpdateEffect)(function () {
+    if (checkedFields.size === fields.length) {
+      setCheckAll(true);
+    } else if (checkedFields.size === 0) {
+      setCheckAll(false);
+    }
+  }, [checkedFields, fields]);
   var _useRequest = (0, _ahooks.useRequest)(_apiUrl.fetchFieldsByDataset, {
       defaultParams: [{
         datasetUid: datasetUid,
@@ -135,10 +151,17 @@ var FieldsSetting = function FieldsSetting(_ref) {
           var col = gridApi.columnApi.getColumn(field.field);
           col.colDef.headerName = value;
           gridApi.api.refreshHeader();
-        } else if (component === 'form') {
-          handleChange(fields);
-        } else if (component === 'tableForm') {
-          handleChange(fields);
+        } else if (['form', 'tableForm'].includes(component)) {
+          handleChange((0, _lodash.reduce)(fields, function (ret, _ref4) {
+            var fieldAliasName = _ref4.fieldAliasName,
+              _field = (0, _objectWithoutProperties2.default)(_ref4, _excluded);
+            if (fieldAliasName) {
+              ret.push((0, _objectSpread2.default)({
+                aliasName: fieldAliasName
+              }, _field));
+            }
+            return ret;
+          }, []));
         }
       });
     }, {
@@ -180,6 +203,15 @@ var FieldsSetting = function FieldsSetting(_ref) {
       remove(data.uid, data);
     }
   });
+  var handleFieldCheckAll = (0, _ahooks.useMemoizedFn)(function (e) {
+    if (e.target.checked) {
+      setAll(fields.map(function (_field) {
+        return [_field.uid, _field];
+      }));
+    } else {
+      reset();
+    }
+  });
   var handleBatchSetting = (0, _ahooks.useMemoizedFn)(function () {
     setDrawerType('batch');
   });
@@ -235,10 +267,18 @@ var FieldsSetting = function FieldsSetting(_ref) {
   });
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Spin, {
     spinning: loading
-  }, /*#__PURE__*/_react.default.createElement(Header, null, /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(Header, null, /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
+    style: {
+      marginLeft: 20
+    },
+    disabled: drawerType === 'batch',
+    checked: checkAll,
+    indeterminate: checkedFields.size > 0 && checkedFields.size !== fields.length,
+    onChange: handleFieldCheckAll
+  }), /*#__PURE__*/_react.default.createElement("div", {
     style: {
-      width: 116,
-      paddingLeft: 40
+      width: 80,
+      paddingLeft: 4
     }
   }, (0, _utils.formatMessage)({
     id: "".concat(_I18N_PREFIX_, ".field"),
@@ -252,8 +292,8 @@ var FieldsSetting = function FieldsSetting(_ref) {
     id: "".concat(_I18N_PREFIX_, ".title"),
     label: '标题'
   }))), /*#__PURE__*/_react.default.createElement(_SortBox.SortBox, {
-    datas: fields.map(function (_ref4) {
-      var uid = _ref4.uid;
+    datas: fields.map(function (_ref5) {
+      var uid = _ref5.uid;
       return uid;
     }),
     onChange: handleSortChange
@@ -279,6 +319,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
       left: /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, field._type !== 'divider' ? /*#__PURE__*/_react.default.createElement(_antd.Checkbox, {
         disabled: drawerType === 'batch',
         data: field,
+        checked: !!get(field.uid),
         onChange: handleFieldCheckChange
       }) : null, /*#__PURE__*/_react.default.createElement(FieldKey, {
         tooltip: true,