@luck-design-biz/luckda 0.0.25-12 → 0.0.25-14

package/lib/lowcode/engine/meta/fieldswitch.props.json

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "checkedChildren",
       "name": "选中时文本",
@@ -16,6 +21,78 @@
       "key": "unCheckedChildren",
       "name": "非选中时文本",
       "type": "string"
+    },
+    {
+      "key": "generalSetting",
+      "name": "通用配置",
+      "type": "group",
+      "props": [
+        {
+          "key": "col",
+          "name": "占列数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "row",
+          "name": "占行数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "note",
+          "name": "字段注释",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "tip",
+          "name": "长说明",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "placeholder",
+          "name": "默认提示",
+          "type": "_I18nInput"
+        }
+      ]
     }
   ],
   "advance": {

package/lib/lowcode/engine/meta/fieldtextarea.props.default.json

@@ -7,6 +7,8 @@
   "groupName": "表单项",
   "order": 1,
   "autosize": false,
+  "col": 1,
+  "row": 1,
   "advance": {
     "events": {}
   }

package/lib/lowcode/engine/meta/fieldtextarea.props.json

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "rows",
       "name": "行数",
@@ -22,6 +27,78 @@
       "key": "maxLength",
       "name": "输入字数限制",
       "type": "number"
+    },
+    {
+      "key": "generalSetting",
+      "name": "通用配置",
+      "type": "group",
+      "props": [
+        {
+          "key": "col",
+          "name": "占列数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "row",
+          "name": "占行数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "note",
+          "name": "字段注释",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "tip",
+          "name": "长说明",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "placeholder",
+          "name": "默认提示",
+          "type": "_I18nInput"
+        }
+      ]
     }
   ],
   "advance": {

package/lib/lowcode/engine/meta/fieldupload.props.default.json

@@ -9,6 +9,8 @@
   "listType": "text",
   "num": 0,
   "accept": "*",
+  "col": 1,
+  "row": 1,
   "advance": {
     "events": {}
   }

package/lib/lowcode/engine/meta/fieldupload.props.json

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "action",
       "name": "上传地址",
@@ -50,6 +55,78 @@
       "name": "上传的文件类型",
       "type": "string",
       "default": "*"
+    },
+    {
+      "key": "generalSetting",
+      "name": "通用配置",
+      "type": "group",
+      "props": [
+        {
+          "key": "col",
+          "name": "占列数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "row",
+          "name": "占行数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "note",
+          "name": "字段注释",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "tip",
+          "name": "长说明",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "placeholder",
+          "name": "默认提示",
+          "type": "_I18nInput"
+        }
+      ]
     }
   ],
   "advance": {

package/lib/lowcode/engine/meta/fielduser.props.default.json

@@ -10,6 +10,8 @@
   "screenable": "true",
   "mode": "modify",
   "extraFilter": null,
+  "col": 1,
+  "row": 1,
   "advance": {
     "events": {}
   }

package/lib/lowcode/engine/meta/fielduser.props.json

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "allowClear",
       "name": "允许清除",
@@ -55,6 +60,78 @@
         }
       ],
       "default": null
+    },
+    {
+      "key": "generalSetting",
+      "name": "通用配置",
+      "type": "group",
+      "props": [
+        {
+          "key": "col",
+          "name": "占列数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "row",
+          "name": "占行数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "note",
+          "name": "字段注释",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "tip",
+          "name": "长说明",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "placeholder",
+          "name": "默认提示",
+          "type": "_I18nInput"
+        }
+      ]
     }
   ],
   "advance": {

package/lib/lowcode/engine/meta/fieldyear.props.default.json

@@ -6,6 +6,8 @@
   "icon": "icon-fieldstring",
   "groupName": "表单项",
   "order": 1,
+  "col": 1,
+  "row": 1,
   "advance": {
     "events": {}
   }

package/lib/lowcode/engine/meta/fieldyear.props.json

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "allowClear",
       "name": "允许清除",
@@ -22,6 +27,78 @@
       "wrapperProps": {
         "suppressIcon": true
       }
+    },
+    {
+      "key": "generalSetting",
+      "name": "通用配置",
+      "type": "group",
+      "props": [
+        {
+          "key": "col",
+          "name": "占列数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "row",
+          "name": "占行数",
+          "type": "radio",
+          "repositioning": true,
+          "options": [
+            {
+              "label": "1",
+              "value": 1
+            },
+            {
+              "label": "2",
+              "value": 2
+            },
+            {
+              "label": "3",
+              "value": 3
+            },
+            {
+              "label": "4",
+              "value": 4
+            }
+          ],
+          "default": 1
+        },
+        {
+          "key": "note",
+          "name": "字段注释",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "tip",
+          "name": "长说明",
+          "type": "_I18nInput"
+        },
+        {
+          "key": "placeholder",
+          "name": "默认提示",
+          "type": "_I18nInput"
+        }
+      ]
     }
   ],
   "advance": {

package/lib/lowcode/painter/DesignToolbar.js

@@ -21,7 +21,7 @@ var _antd = require("luck-design/antd");
 var _utils = require("@luck-design-biz/base/utils");
 var _ContextProvider = require("../engine/provider/ContextProvider");
 var _JsonEditor = _interopRequireDefault(require("../painter/components/code-editor/JsonEditor"));
-var _preview = _interopRequireDefault(require("../preview"));
+var _PreviewIframe = _interopRequireDefault(require("./components/PreviewIframe"));
 var _constants = require("../constants");
 var _design = _interopRequireDefault(require("./style/design.less"));
 var _apiUrl = require("../constants/api-url");
@@ -408,10 +408,9 @@ var DesignToolbar = function DesignToolbar(_ref) {
     getContainer: function getContainer() {
       return document.getElementById('lc-design-workspace');
     }
-  }, /*#__PURE__*/_react.default.createElement(_preview.default, {
+  }, /*#__PURE__*/_react.default.createElement(_PreviewIframe.default, {
     code: location.query.code,
-    userId: userId || 'no-user',
-    debug: true
+    userId: userId || 'no-user'
   })));
 };
 var _default = exports.default = DesignToolbar;

package/lib/lowcode/painter/Panel.js

@@ -111,13 +111,14 @@ var Panel = function Panel() {
       before(handleChange);
     }
     task(targetId, newValue).then(function () {
+      var _id = (0, _lodash.isNil)(activeNode.$target) ? activeNode.node.id : activeNode.$target.id;
       context.$publisher(context.topics.COMPONENT_MODIFY, {
-        id: targetId,
+        id: _id,
         oldValue: oldValue,
         newValue: newValue
       });
       if (repositioning) context.$publisher(context.topics.COMPONENT_REPOSITIONING, {
-        id: targetId
+        id: _id
       });
     });
   });

package/lib/lowcode/painter/components/PreviewIframe.js

@@ -0,0 +1,63 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
+var _reactDom = require("react-dom");
+var _ahooks = require("ahooks");
+var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _preview = _interopRequireDefault(require("../../preview"));
+var Iframe = _styledComponents.default.iframe.withConfig({
+  displayName: "Iframe",
+  componentId: "luckda-6530__sc-cyloc5-0"
+})(["width:100%;height:100%;border:none;"]);
+var PreviewIframe = function PreviewIframe(_ref) {
+  var code = _ref.code,
+    userId = _ref.userId;
+  var ref = (0, _react.useRef)();
+  var _useBoolean = (0, _ahooks.useBoolean)(false),
+    _useBoolean2 = (0, _slicedToArray2.default)(_useBoolean, 2),
+    isMount = _useBoolean2[0],
+    setTrue = _useBoolean2[1].setTrue;
+  (0, _react.useEffect)(function () {
+    var styles = Array.from(document.styleSheets).map(function (styleSheet) {
+      if (styleSheet.href) {
+        var link = document.createElement('link');
+        link.rel = 'stylesheet';
+        link.href = styleSheet.href;
+        return link;
+      } else {
+        try {
+          var style = document.createElement('style');
+          style.textContent = Array.from(styleSheet.cssRules).map(function (rule) {
+            return rule.cssText;
+          }).join('\n');
+          return style;
+        } catch (e) {
+          console.error(e);
+          return null;
+        }
+      }
+    }).filter(Boolean);
+    styles.forEach(function (style) {
+      return ref.current.contentDocument.head.appendChild(style);
+    });
+    ref.current.contentDocument.body.setAttribute('luck-theme', 'base');
+    setTrue();
+  }, []);
+  return /*#__PURE__*/_react.default.createElement(Iframe, {
+    ref: ref
+  }, isMount && /*#__PURE__*/(0, _reactDom.createPortal)( /*#__PURE__*/_react.default.createElement("div", {
+    id: "root"
+  }, /*#__PURE__*/_react.default.createElement(_preview.default, {
+    code: code,
+    userId: userId,
+    debug: true
+  })), ref.current.contentDocument.body));
+};
+var _default = exports.default = PreviewIframe;

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

@@ -324,7 +324,7 @@ var SettingUI = function SettingUI(_ref) {
     onChange: function onChange(val) {
       return run('tip', val);
     }
-  }))), component === 'form' && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+  }))), component === 'form' && /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".fieldColumn"),
       label: '占列数'
@@ -342,58 +342,7 @@ var SettingUI = function SettingUI(_ref) {
     value: 3
   }, "3"), /*#__PURE__*/_react.default.createElement(_antd.Radio, {
     value: 4
-  }, "4"))), /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
-    label: (0, _utils.formatMessage)({
-      id: "".concat(_I18N_PREFIX_, ".fieldRow"),
-      label: '占行数'
-    })
-  }, /*#__PURE__*/_react.default.createElement(StyledRadio, {
-    defaultValue: fieldData.row,
-    onChange: function onChange(e) {
-      return run('row', e.target.value);
-    }
-  }, /*#__PURE__*/_react.default.createElement(_antd.Radio, {
-    value: 1
-  }, "1"), /*#__PURE__*/_react.default.createElement(_antd.Radio, {
-    value: 2
-  }, "2"), /*#__PURE__*/_react.default.createElement(_antd.Radio, {
-    value: 3
-  }, "3"), /*#__PURE__*/_react.default.createElement(_antd.Radio, {
-    value: 4
-  }, "4"))), /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
-    label: (0, _utils.formatMessage)({
-      id: "".concat(_I18N_PREFIX_, ".fieldNote"),
-      label: '字段注释'
-    })
-  }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
-    defaultValue: fieldData.note,
-    onChange: function onChange(e) {
-      return runDebounce('note', e.target.value);
-    },
-    size: "small"
-  })), /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
-    label: (0, _utils.formatMessage)({
-      id: "".concat(_I18N_PREFIX_, ".fieldTip"),
-      label: '长说明'
-    })
-  }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
-    defaultValue: fieldData.tip,
-    onChange: function onChange(e) {
-      return runDebounce('tip', e.target.value);
-    },
-    size: "small"
-  })), /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
-    label: (0, _utils.formatMessage)({
-      id: "".concat(_I18N_PREFIX_, ".placeholder"),
-      label: '默认提示'
-    })
-  }, /*#__PURE__*/_react.default.createElement(_antd.Input, {
-    defaultValue: fieldData.placeholder,
-    onChange: function onChange(e) {
-      return runDebounce('placeholder', e.target.value);
-    },
-    size: "small"
-  }))), !isBatch ? /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
+  }, "4"))), !isBatch ? /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
     label: (0, _utils.formatMessage)({
       id: "".concat(_I18N_PREFIX_, ".isEqual"),
       label: '唯一校验'

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

@@ -11,8 +11,6 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireDefault(require("react"));
 var _ahooks = require("ahooks");
-var _antd = require("luck-design/antd");
-var _utils = require("@luck-design-biz/base/utils");
 var _lodash = require("lodash");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
 var _SettingUI = _interopRequireDefault(require("./SettingUI"));