@luck-design-biz/luckda 1.0.0-alpha → 1.0.1

package/lib/lowcode/painter/components/code-editor/VisionEditor.js

@@ -0,0 +1,88 @@
+"use strict";
+
+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 _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireWildcard(require("react"));
+var monaco = _interopRequireWildcard(require("monaco-editor"));
+var _BaseEditor = _interopRequireDefault(require("./BaseEditor"));
+var _excluded = ["children"];
+// 定义一个简单的JavaScript语言
+monaco.languages.register({
+  id: 'vision'
+});
+
+// 定义语言的配置
+monaco.languages.setLanguageConfiguration('vision', {
+  brackets: [['{', '}'], ['[', ']'], ['(', ')']],
+  autoClosingPairs: [{
+    open: '{',
+    close: '}'
+  }, {
+    open: '[',
+    close: ']'
+  }, {
+    open: '(',
+    close: ')'
+  }, {
+    open: '"',
+    close: '"',
+    notIn: ['string']
+  }, {
+    open: "'",
+    close: "'",
+    notIn: ['string']
+  }]
+});
+
+// 定义语言的词法规则
+monaco.languages.setMonarchTokensProvider('vision', {
+  tokenizer: {
+    root: [[/\b(true|false|null)\b/, 'constant'], [/[{}()\[\]]/, '@brackets'], [/[0-9]+/, 'number'], [/["'](.*?)["']/, 'string'],
+    // 新增模板字符串的词法规则
+    [/\$\{/, 'delimiter.curly'],
+    // 添加对模板表达式起始的支持
+    [/\`/, {
+      token: 'string.quote',
+      bracket: '@open',
+      next: '@template_string'
+    }] // 处理模板字符串
+    ],
+    template_string: [[/\$\{/, {
+      token: 'delimiter.curly',
+      next: '@expression'
+    }],
+    // 模板表达式开始
+    [/\`/, {
+      token: 'string.quote',
+      bracket: '@close',
+      next: '@pop'
+    }],
+    // 模板字符串结束
+    [/./, 'string'] // 模板字符串内的内容
+    ],
+    expression: [[/\}/, {
+      token: 'delimiter.curly',
+      next: '@pop'
+    }],
+    // 模板表达式结束
+    [/[0-9]+/, 'number'],
+    // 在模板表达式内的数字
+    [/[a-zA-Z_]\w*/, 'identifier'] // 在模板表达式内的标识符
+    ]
+  }
+});
+var VisionEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var children = _ref.children,
+    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  return /*#__PURE__*/_react.default.createElement(_BaseEditor.default, (0, _extends2.default)({
+    ref: ref,
+    language: "vision"
+  }, rest), children);
+});
+var _default = exports.default = /*#__PURE__*/_react.default.memo(VisionEditor);

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

@@ -21,6 +21,7 @@ var _Collapse = _interopRequireDefault(require("../../components/Collapse"));
 var _PanelItem = _interopRequireDefault(require("../../components/PanelItem"));
 var _ListEditor = require("../../components/ListEditor");
 var _WidthHeight = _interopRequireDefault(require("../../panel-section/WidthHeight"));
+var _JSEditor = _interopRequireDefault(require("../../panel-section/JSEditor"));
 var _FieldAttrsModal = _interopRequireDefault(require("./FieldAttrsModal"));
 var _FieldRulesModal = _interopRequireDefault(require("./FieldRulesModal"));
 var _apiUrl = require("../../../constants/api-url");
@@ -78,6 +79,7 @@ var StyledRadio = (0, _styledComponents.default)(_antd.Radio.Group).withConfig({
   displayName: "StyledRadio",
   componentId: "luckda-6530__sc-1n41f3z-2"
 })(["span.ant-radio + *{padding-left:4px;padding-right:4px;}"]);
+var _DEFAULT_RENDER_CODE = "function render(value, data, rowIndex, params) { \n  return value;\n}";
 var SettingUI = function SettingUI(_ref) {
   var loading = _ref.loading,
     data = _ref.data,
@@ -357,7 +359,7 @@ var SettingUI = function SettingUI(_ref) {
       id: "".concat(_I18N_PREFIX_, ".required"),
       label: '是否必填'
     })
-  }, renderCodeIcon(fieldRequired, _constants.FIELD_SCOPES.FIELD_REQUIRED)), ['table', 'tableForm'].includes && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+  }, renderCodeIcon(fieldRequired, _constants.FIELD_SCOPES.FIELD_REQUIRED)), ['table', 'tableForm'].includes(component) && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".table.display"),
       label: '表格中显示'
@@ -377,7 +379,19 @@ var SettingUI = function SettingUI(_ref) {
       id: "".concat(_I18N_PREFIX_, ".readonly"),
       label: '是否只读'
     })
-  }, renderCodeIcon(fieldReadonly, _constants.FIELD_SCOPES.FIELD_READONLY)), !isBatch ? /*#__PURE__*/_react.default.createElement(_Collapse.default, {
+  }, renderCodeIcon(fieldReadonly, _constants.FIELD_SCOPES.FIELD_READONLY)), !isBatch ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, ['table', 'tableForm'].includes(component) ? /*#__PURE__*/_react.default.createElement(_Collapse.default, {
+    label: (0, _utils.formatMessage)({
+      id: "".concat(_I18N_PREFIX_, ".render"),
+      label: '内容定制渲染'
+    })
+  }, /*#__PURE__*/_react.default.createElement(_JSEditor.default, {
+    defaultValue: fieldData.render,
+    onChange: function onChange(val) {
+      return run('render', val);
+    },
+    mustConfirm: true,
+    defaultCode: _DEFAULT_RENDER_CODE
+  })) : null, /*#__PURE__*/_react.default.createElement(_Collapse.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".defaultValue"),
       label: '默认值'
@@ -392,7 +406,7 @@ 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(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_Collapse.default, {
+  }))), /*#__PURE__*/_react.default.createElement(_Collapse.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".rules.front"),
       label: '前端校验规则'

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

@@ -234,7 +234,7 @@ var FieldSetting = function FieldSetting(_ref) {
             _context.next = 34;
             break;
           case 5:
-            if (!(key === 'align' || key === 'headerAlign' || key === 'pinned' || key === 'tip')) {
+            if (!(key === 'align' || key === 'headerAlign' || key === 'pinned' || key === 'tip' || key === 'render')) {
               _context.next = 9;
               break;
             }

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

@@ -11,6 +11,7 @@ var getFrontRules = exports.getFrontRules = function getFrontRules(property) {
     case 'money':
     case 'decimal':
     case 'sint':
+    case 'long':
       rules = [{
         label: '最小值',
         key: 'min',
@@ -53,7 +54,7 @@ var getFrontRules = exports.getFrontRules = function getFrontRules(property) {
   rules.push({
     label: '自定义',
     key: 'rules',
-    defaultCode: "function validator(cValue, rule, value, callback) { \n if(!value) callback('errorMsg'); \n callback(); \n}"
+    defaultCode: "function validator(cValue, rule, value, callback) { \n if(!value) callback('errorMsg'); \n else callback(); \n}"
   });
   return rules;
 };

package/lib/lowcode/painter/index.js

@@ -20,6 +20,7 @@ var Painter = function Painter(_ref) {
   var className = _ref.className,
     code = _ref.code;
   return /*#__PURE__*/_react.default.createElement(_EventBusProvider.default, {
+    key: code,
     runtime: _index.RUNTIME.DESIGN
   }, /*#__PURE__*/_react.default.createElement(_ContextProvider.default, {
     code: code

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

@@ -8,6 +8,12 @@ exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var Paragraph = _antd.Typography.Paragraph;
+var BlockIdSpan = (0, _styledComponents.default)(Paragraph).withConfig({
+  displayName: "BlockIdSpan",
+  componentId: "luckda-6530__sc-gbohir-0"
+})(["display:inline-block;margin:0;color:#595959;text-decoration:var(--ant-primary-color) wavy underline;cursor:copy;padding:0 4px;"]);
 var BlockEditor = function BlockEditor(_ref) {
   var blockName = _ref.blockName,
     blockId = _ref.blockId,
@@ -18,17 +24,25 @@ var BlockEditor = function BlockEditor(_ref) {
       blockId: blockId
     });
   });
-  return /*#__PURE__*/_react.default.createElement("span", {
+  var handleCopyBlockId = (0, _ahooks.useMemoizedFn)(function (e) {
+    e.stopPropagation();
+  });
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("span", {
     onClick: handleClick,
     style: next ? {
       color: 'var(--ant-primary-color)',
       cursor: 'pointer'
     } : {}
-  }, blockName || blockId, next && /*#__PURE__*/_react.default.createElement(_antd.Icon, {
-    type: "setting",
+  }, blockName, /*#__PURE__*/_react.default.createElement("span", {
+    onClick: handleCopyBlockId
+  }, /*#__PURE__*/_react.default.createElement(BlockIdSpan, {
     style: {
-      marginLeft: 4
+      display: 'inline-block',
+      margin: 0
+    },
+    copyable: {
+      text: blockId
     }
-  }));
+  }, blockId))));
 };
 var _default = exports.default = BlockEditor;

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

@@ -50,7 +50,7 @@ var addOptions = [{
   }),
   value: 'blank'
 }];
-var BlockEditor = function BlockEditor(_ref) {
+var BlocksEditor = function BlocksEditor(_ref) {
   var onChange = _ref.onChange,
     nodeId = _ref.nodeId,
     renderPanelItems = _ref.renderPanelItems,
@@ -233,4 +233,4 @@ var BlockEditor = function BlockEditor(_ref) {
     label: '新增区块'
   }))))) : null;
 };
-var _default = exports.default = BlockEditor;
+var _default = exports.default = BlocksEditor;

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

@@ -0,0 +1,250 @@
+"use strict";
+
+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 _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireWildcard(require("react"));
+var _ahooks = require("ahooks");
+var _lodash = require("lodash");
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _antd = require("luck-design/antd");
+var _utils = require("@luck-design-biz/base/utils");
+var _ListEditor = require("../components/ListEditor");
+var _Collapse = _interopRequireDefault(require("../components/Collapse"));
+var _SortBox = require("../components/SortBox");
+var _PanelItem = _interopRequireDefault(require("../components/PanelItem"));
+var _complexPop = require("../services/complexPop");
+var _excluded = ["field", "fieldName", "renderItemRight", "onChange", "sortable", "editable"];
+var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.complexPop';
+var DividerSpan = _styledComponents.default.span.withConfig({
+  displayName: "DividerSpan",
+  componentId: "luckda-6530__sc-lmsle1-0"
+})(["font-size:12px;color:var(--luck-text-color);"]);
+var FieldKey = _styledComponents.default.div.withConfig({
+  displayName: "FieldKey",
+  componentId: "luckda-6530__sc-lmsle1-1"
+})(["width:200px;margin-left:4px;display:inline-block;white-space:nowrap;word-break:keep-all;text-overflow:ellipsis;overflow:hidden;"]);
+var ListItem = function ListItem(_ref) {
+  var field = _ref.field,
+    fieldName = _ref.fieldName,
+    renderItemRight = _ref.renderItemRight,
+    _onChange = _ref.onChange,
+    sortable = _ref.sortable,
+    editable = _ref.editable,
+    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  return /*#__PURE__*/_react.default.createElement(_ListEditor.ListEditorItem, (0, _extends2.default)({
+    key: field,
+    left: /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+      title: field
+    }, editable ? /*#__PURE__*/_react.default.createElement(_antd.Input, {
+      value: fieldName,
+      size: "small",
+      style: {
+        width: '200px'
+      },
+      onChange: function onChange(e) {
+        return _onChange(field, e.target.value);
+      }
+    }) : /*#__PURE__*/_react.default.createElement(FieldKey, null, " ", fieldName, " ")),
+    right: renderItemRight({
+      field: field,
+      title: fieldName
+    }),
+    item: field,
+    sortable: sortable
+  }, props));
+};
+var ComplexPop = function ComplexPop(_ref2) {
+  var nodeId = _ref2.nodeId,
+    settings = _ref2.settings,
+    defaultValue = _ref2.defaultValue,
+    onChange = _ref2.onChange;
+  var _useState = (0, _react.useState)(defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.show),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    show = _useState2[0],
+    setShow = _useState2[1];
+  var _useState3 = (0, _react.useState)((defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.fields) || []),
+    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+    fields = _useState4[0],
+    setFields = _useState4[1];
+  var _useState5 = (0, _react.useState)(null),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    allFields = _useState6[0],
+    setAllFields = _useState6[1];
+  var _useCreation = (0, _ahooks.useCreation)(function () {
+      var _nodeId$split = nodeId.split('.'),
+        _nodeId$split2 = (0, _slicedToArray2.default)(_nodeId$split, 3),
+        _ = _nodeId$split2[0],
+        blockid = _nodeId$split2[1],
+        fieldid = _nodeId$split2[2];
+      var blocksObj = (0, _lodash.keyBy)(settings === null || settings === void 0 ? void 0 : settings.blocks, 'id');
+      if (blocksObj[blockid]) {
+        var _fieldObj$fieldid;
+        var fieldObj = (0, _lodash.keyBy)(blocksObj[blockid].fields, 'field');
+        return ((_fieldObj$fieldid = fieldObj[fieldid]) === null || _fieldObj$fieldid === void 0 ? void 0 : _fieldObj$fieldid.complexConfig) || {};
+      }
+      return {};
+    }, [nodeId, settings === null || settings === void 0 ? void 0 : settings.blocks]),
+    isTree = _useCreation.isTree,
+    datasetKey = _useCreation.datasetKey,
+    dataModelKey = _useCreation.dataModelKey;
+  (0, _react.useEffect)(function () {
+    if (!isTree && show && datasetKey && dataModelKey && !allFields) {
+      (0, _complexPop.getFields)({
+        datasetCode: datasetKey,
+        dataModelKey: dataModelKey
+      }).then(function (res) {
+        var code = res.code,
+          data = res.data;
+        if (code === 1) {
+          var _data = (0, _lodash.reduce)(data, function (result, item) {
+            result[item.field] = item.field_name;
+            return result;
+          }, {});
+          setAllFields(_data);
+        }
+      });
+    }
+  }, [isTree, show, datasetKey, dataModelKey, allFields]);
+  (0, _react.useLayoutEffect)(function () {
+    onChange({
+      show: show,
+      fields: fields
+    });
+  }, [show, fields]);
+  var renderItemDeleteRight = (0, _ahooks.useMemoizedFn)(function (data) {
+    return /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+      type: "delete",
+      style: {
+        margin: '0 4px',
+        cursor: 'pointer',
+        color: 'var(--luck-color-danger)'
+      },
+      onClick: function onClick() {
+        var _fields = (0, _lodash.cloneDeep)(fields);
+        (0, _lodash.remove)(_fields, function (item) {
+          return item.field === data.field;
+        });
+        setFields(_fields);
+      }
+    });
+  });
+  var renderItemAddRight = (0, _ahooks.useMemoizedFn)(function (data) {
+    return /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+      type: "plus-circle",
+      style: {
+        margin: '0 4px',
+        cursor: 'pointer',
+        color: 'var(--ant-primary-color)'
+      },
+      onClick: function onClick() {
+        return setFields(fields.concat(data));
+      }
+    });
+  });
+  var handleChange = (0, _ahooks.useMemoizedFn)(function (field, value) {
+    setFields(fields.map(function (item) {
+      return item.field === field ? (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+        title: value
+      }) : item;
+    }));
+  });
+  var handleSortFields = (0, _ahooks.useMemoizedFn)(function (sortItems) {
+    var oldItems = (0, _lodash.cloneDeep)(fields);
+    var newItems = oldItems.sort(function (a, b) {
+      var indexA = sortItems.indexOf(a.field);
+      var indexB = sortItems.indexOf(b.field);
+      return indexA - indexB;
+    });
+    setFields(newItems);
+  });
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+    field: "showPop",
+    label: (0, _utils.formatMessage)({
+      id: "".concat(_I18N_PREFIX_, ".assisted"),
+      label: "辅助选择"
+    })
+  }, /*#__PURE__*/_react.default.createElement(_antd.Switch, {
+    size: "small",
+    defaultChecked: defaultValue === null || defaultValue === void 0 ? void 0 : defaultValue.show,
+    onChange: function onChange(val) {
+      setShow(val);
+      if (!val) setFields([]);
+    }
+  })), !isTree && show && /*#__PURE__*/_react.default.createElement(_Collapse.default, {
+    label: (0, _utils.formatMessage)({
+      id: "".concat(_I18N_PREFIX_, ".assistedGrid"),
+      label: '辅助弹窗显示字段'
+    })
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    style: {
+      height: 'auto',
+      padding: '0 16px'
+    }
+  }, /*#__PURE__*/_react.default.createElement(_antd.Spin, {
+    spinning: !allFields
+  }, /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+    orientation: "left",
+    style: {
+      marginTop: 0
+    }
+  }, /*#__PURE__*/_react.default.createElement(DividerSpan, null, (0, _utils.formatMessage)({
+    id: "".concat(_I18N_PREFIX_, ".assistedGridFields"),
+    label: '展示区'
+  }))), /*#__PURE__*/_react.default.createElement(_SortBox.SortBox, {
+    datas: fields.map(function (f) {
+      return f.field;
+    }),
+    onChange: handleSortFields
+  }, /*#__PURE__*/_react.default.createElement(_ListEditor.ListEditor, {
+    style: {
+      marginTop: 8
+    },
+    suppressAdd: true
+  }, fields.map(function (_ref3) {
+    var field = _ref3.field,
+      title = _ref3.title;
+    return /*#__PURE__*/_react.default.createElement(_SortBox.SortItem, {
+      key: field,
+      id: field
+    }, /*#__PURE__*/_react.default.createElement(ListItem, {
+      field: field,
+      fieldName: title,
+      renderItemRight: renderItemDeleteRight,
+      sortable: true,
+      editable: true,
+      onChange: handleChange
+    }));
+  }))), /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+    orientation: "left",
+    style: {
+      marginTop: 0
+    }
+  }, /*#__PURE__*/_react.default.createElement(DividerSpan, null, (0, _utils.formatMessage)({
+    id: "".concat(_I18N_PREFIX_, ".gridFields"),
+    label: '可选区'
+  }))), /*#__PURE__*/_react.default.createElement(_ListEditor.ListEditor, {
+    style: {
+      marginTop: 8
+    },
+    suppressAdd: true
+  }, (0, _lodash.map)((0, _lodash.omit)(allFields, fields.map(function (f) {
+    return f.field;
+  })), function (fieldName, field) {
+    return /*#__PURE__*/_react.default.createElement(ListItem, {
+      key: field,
+      field: field,
+      fieldName: fieldName,
+      renderItemRight: renderItemAddRight,
+      sortable: false
+    });
+  }))))));
+};
+var _default = exports.default = ComplexPop;

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

@@ -103,6 +103,14 @@ var DataSetSelector = function DataSetSelector(_ref) {
                     restProps.align = alignMapping[_extra.scell_alignment];
                     restProps.headerAlign = alignMapping[_extra.sheading_alignment];
                   }
+                  if (f.property === "complex") {
+                    var _extra2 = JSON.parse(f.extra || '{}');
+                    restProps.complexConfig = {
+                      isTree: _extra2.opt_show_tree,
+                      datasetKey: _extra2.opt_dataset,
+                      dataModelKey: _extra2.opt_data_model
+                    };
+                  }
                   return (0, _objectSpread2.default)({
                     uid: f.uid,
                     field: f.field

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

@@ -24,7 +24,7 @@ var _apiUrl = require("../../constants/api-url");
 var _helper = require("../../engine/tools/helper");
 var _fieldsSetting = _interopRequireDefault(require("../style/fields-setting.less"));
 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', 'render', 'col', 'row', 'note', 'placeholder', 'fieldAliasName', 'complexConfig'];
 var Header = _styledComponents.default.div.withConfig({
   displayName: "Header",
   componentId: "luckda-6530__sc-gcwvp1-0"
@@ -108,6 +108,14 @@ var FieldsSetting = function FieldsSetting(_ref) {
               restProps.align = alignMapping[extra.scell_alignment];
               restProps.headerAlign = alignMapping[extra.sheading_alignment];
             }
+            if (_fieldData.property === "complex") {
+              var _extra = JSON.parse(_fieldData.extra || '{}');
+              restProps.complexConfig = {
+                isTree: _extra.opt_show_tree,
+                datasetKey: _extra.opt_dataset,
+                dataModelKey: _extra.opt_data_model
+              };
+            }
             return (0, _objectSpread2.default)({
               uid: id,
               field: detail[id].field
@@ -221,7 +229,25 @@ var FieldsSetting = function FieldsSetting(_ref) {
       onChange: function onChange(e) {
         return handleAliasChange(field, e.target.value);
       }
-    }), field._type !== 'divider' && /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+    }), field._type === 'divider' ? /*#__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: {
+        margin: '0 4px',
+        cursor: 'pointer'
+      },
+      onClick: function onClick() {
+        dispatch({
+          type: 'delete',
+          payload: field.id,
+          callback: handleChange
+        });
+      }
+    })) : /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
       title: (0, _utils.formatMessage)({
         id: 'luckda.lowcode.painter.edit',
         label: '编辑'
@@ -298,7 +324,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
         tooltip: true,
         lines: 1,
         style: field._type === 'divider' ? {
-          paddingLeft: 16
+          marginLeft: 20
         } : null
       }, field.field)),
       right: renderItemRight(field),

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

@@ -12,7 +12,8 @@ var I18nInput = function I18nInput(_ref) {
   var defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
     size = _ref.size,
-    wrapped = _ref.wrapped;
+    wrapped = _ref.wrapped,
+    disabled = _ref.disabled;
   var _useDebounceFn = (0, _ahooks.useDebounceFn)(onChange, {
       wait: 400
     }),
@@ -28,7 +29,8 @@ var I18nInput = function I18nInput(_ref) {
     autoSize: false,
     style: {
       resize: 'none'
-    }
+    },
+    disabled: disabled
   }) : /*#__PURE__*/_react.default.createElement(_antd.Input, {
     defaultValue: defaultValue,
     onChange: function onChange(e) {

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

@@ -36,15 +36,20 @@ var _IconFont = _interopRequireDefault(require("../../../components/IconFont"));
  */
 function _default(_ref) {
   var defaultValue = _ref.defaultValue,
-    next = _ref.next;
-  var _useState = (0, _react.useState)(defaultValue),
+    next = _ref.next,
+    _onClick = _ref.onClick,
+    value = _ref.value;
+  var _useState = (0, _react.useState)(value || defaultValue),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     val = _useState2[0],
     setVal = _useState2[1];
+  (0, _react.useLayoutEffect)(function () {
+    setVal(value);
+  }, [value]);
   return /*#__PURE__*/_react.default.createElement("div", {
     className: _icon.default['lc-painter-panel-section-icon'],
     onClick: function onClick() {
-      return next({
+      return _onClick ? _onClick.apply(void 0, arguments) : next({
         onSelect: setVal
       });
     }

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

@@ -14,7 +14,6 @@ var _ahooks = require("ahooks");
 var _antd = require("luck-design/antd");
 var _utils = require("@luck-design-biz/base/utils");
 var _ListEditor = require("../components/ListEditor");
-var _PopConfirm = _interopRequireDefault(require("../components/PopConfirm"));
 var _Icon = _interopRequireDefault(require("./Icon"));
 var _IconSelector = _interopRequireDefault(require("./IconSelector"));
 var _JSEditor = _interopRequireDefault(require("./JSEditor"));
@@ -32,7 +31,7 @@ var IconConditionSelector = function IconConditionSelector(_ref) {
     switch (type) {
       case 'icon':
         _list[index] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _list[index]), {}, {
-          icon: "icon".concat(value)
+          icon: value
         });
         break;
       case 'code':
@@ -101,14 +100,15 @@ var IconConditionSelector = function IconConditionSelector(_ref) {
   }, list.map(function (item, index) {
     return /*#__PURE__*/_react.default.createElement(_ListEditor.ListEditorItem, {
       sortable: false,
-      left: /*#__PURE__*/_react.default.createElement(_PopConfirm.default, {
+      left: /*#__PURE__*/_react.default.createElement(_antd.Popover, {
         placement: "left",
-        title: /*#__PURE__*/_react.default.createElement(_IconSelector.default, {
+        content: /*#__PURE__*/_react.default.createElement(_IconSelector.default, {
           value: item.icon,
           onChange: function onChange(value) {
-            return handleChange('icon', index, value['font_class']);
+            return handleChange('icon', index, value);
           }
-        })
+        }),
+        trigger: "click"
       }, /*#__PURE__*/_react.default.createElement(_Icon.default, {
         value: item.icon
       })),

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

@@ -111,7 +111,7 @@ function _default(_ref) {
   }, [iconData, searchTerm]);
   var handleClick = (0, _ahooks.useMemoizedFn)(function (icon) {
     var _iconfont = "".concat(iconData.css_prefix_text).concat(icon.font_class);
-    onSelect(_iconfont);
+    onSelect === null || onSelect === void 0 || onSelect(_iconfont);
     onChange(_iconfont);
   });
   return /*#__PURE__*/_react.default.createElement("div", {