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

package/es/lowcode/painter/DesignToolbar.js

@@ -14,7 +14,7 @@ import { Select, Button, Icon, Divider, Modal, message, Drawer } from 'luck-desi
 import { showPop, formatMessage } from '@luck-design-biz/base/utils';
 import { useContext, useGet, resetPageData, useTemporalStore } from "../engine/provider/ContextProvider";
 import JsonEditor from "../painter/components/code-editor/JsonEditor";
-import Preview from "../preview";
+import PreviewIframe from "./components/PreviewIframe";
 import { LC_BUILDIN_UNIT_KEY, COOKIE_VIRTUAL_ACCOUNT_KEY } from "../constants";
 import styles from "./style/design.less";
 import { fetchClearCache, fetchUpdatePageData } from "../constants/api-url";
@@ -400,10 +400,9 @@ var DesignToolbar = function DesignToolbar(_ref) {
     getContainer: function getContainer() {
       return document.getElementById('lc-design-workspace');
     }
-  }, /*#__PURE__*/React.createElement(Preview, {
+  }, /*#__PURE__*/React.createElement(PreviewIframe, {
     code: location.query.code,
-    userId: userId || 'no-user',
-    debug: true
+    userId: userId || 'no-user'
   })));
 };
 export default DesignToolbar;

package/es/lowcode/painter/Panel.js

@@ -103,13 +103,14 @@ var Panel = function Panel() {
       before(handleChange);
     }
     task(targetId, newValue).then(function () {
+      var _id = 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/es/lowcode/painter/components/PreviewIframe.js

@@ -0,0 +1,55 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useRef, useEffect } from 'react';
+import { createPortal } from 'react-dom';
+import { useBoolean } from 'ahooks';
+import styled from 'styled-components';
+import Preview from "../../preview";
+var Iframe = styled.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 = useRef();
+  var _useBoolean = useBoolean(false),
+    _useBoolean2 = _slicedToArray(_useBoolean, 2),
+    isMount = _useBoolean2[0],
+    setTrue = _useBoolean2[1].setTrue;
+  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.createElement(Iframe, {
+    ref: ref
+  }, isMount && /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement("div", {
+    id: "root"
+  }, /*#__PURE__*/React.createElement(Preview, {
+    code: code,
+    userId: userId,
+    debug: true
+  })), ref.current.contentDocument.body));
+};
+export default PreviewIframe;

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

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

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

@@ -4,8 +4,6 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React from 'react';
 import { useRequest, useSetState, useDebounceFn, useMemoizedFn } from 'ahooks';
-import { Modal } from 'luck-design/antd';
-import { formatMessage } from '@luck-design-biz/base/utils';
 import { dropWhile, startsWith } from 'lodash';
 import { useContext } from "../../../engine/provider/ContextProvider";
 import SettingUI from "./SettingUI";

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

@@ -1,4 +1,5 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useEffect, useState } from 'react';
@@ -81,9 +82,11 @@ var DataSetSelector = function DataSetSelector(_ref) {
               onChange(_ds, function (exe) {
                 var dsFields = res.data.dataSets[value];
                 exe(fieldsKey, dsFields.map(function (f) {
-                  var _extra = JSON.parse(f.extra || '{}');
-                  var restProps = {};
+                  var restProps = {
+                    fieldAliasName: f.fieldAliasName || f.fieldName
+                  };
                   if (['table', 'tableForm'].includes(component)) {
+                    var _extra = JSON.parse(f.extra || '{}');
                     var alignMapping = {
                       0: 'left',
                       1: 'center',
@@ -92,10 +95,10 @@ var DataSetSelector = function DataSetSelector(_ref) {
                     restProps.align = alignMapping[_extra.scell_alignment];
                     restProps.headerAlign = alignMapping[_extra.sheading_alignment];
                   }
-                  return {
+                  return _objectSpread({
                     uid: f.uid,
                     field: f.field
-                  };
+                  }, restProps);
                 }));
               });
               setCurrentDataset(_ds);

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

@@ -1,9 +1,7 @@
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["fieldAliasName"];
 import React, { useReducer, useState } from 'react';
-import { useMemoizedFn, useRequest, useDebounceFn, useCreation, useMap, useUpdateEffect } from 'ahooks';
+import { useMemoizedFn, useRequest, useCreation, useMap, useUpdateEffect } from 'ahooks';
 import { Ellipsis } from 'luck-design';
 import { Spin, Input, Tooltip, Icon, Checkbox, Drawer } from 'luck-design/antd';
 import styled from 'styled-components';
@@ -14,11 +12,11 @@ import { SortBox, SortItem } from "../components/SortBox";
 import { ListEditor, ListEditorItem } from "../components/ListEditor";
 import FieldSetting from "../components/field-setting";
 import BatchSetting from "../components/field-setting/BatchSetting";
-import { fetchFieldsByDataset, fetchUpdateFieldAttrs } from "../../constants/api-url";
+import { fetchFieldsByDataset } from "../../constants/api-url";
 import { listReducer, getLDMetaAttr } from "../../engine/tools/helper";
 import styles from "../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', 'aliasName'];
+var _PICK_KEYS_ = ['id', 'uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip', 'col', 'row', 'note', 'placeholder', 'fieldAliasName'];
 var Header = styled.div.withConfig({
   displayName: "Header",
   componentId: "luckda-6530__sc-gcwvp1-0"
@@ -89,9 +87,11 @@ var FieldsSetting = function FieldsSetting(_ref) {
             return ret;
           }, []), list.map(function (id) {
             var _fieldData = detail[id];
-            var extra = JSON.parse(_fieldData.extra || '{}');
-            var restProps = {};
+            var restProps = {
+              fieldAliasName: _fieldData.fieldAliasName
+            };
             if (['table', 'tableForm'].includes(component)) {
+              var extra = JSON.parse(_fieldData.extra || '{}');
               var alignMapping = {
                 0: 'left',
                 1: 'center',
@@ -123,46 +123,6 @@ var FieldsSetting = function FieldsSetting(_ref) {
       return _fieldData._type === 'divider' ? _fieldData : pick(_fieldData, _PICK_KEYS_);
     }));
   });
-  var _useRequest2 = useRequest(fetchUpdateFieldAttrs, {
-      manual: true
-    }),
-    runUpdateFieldAttrs = _useRequest2.runAsync;
-  var _useDebounceFn = useDebounceFn(function (field, value) {
-      var _getLDMetaAttr = getLDMetaAttr(['moduleId', 'dataModelKey']),
-        _getLDMetaAttr2 = _slicedToArray(_getLDMetaAttr, 2),
-        moduleId = _getLDMetaAttr2[0],
-        dataModelKey = _getLDMetaAttr2[1];
-      runUpdateFieldAttrs({
-        dataModelKey: dataModelKey,
-        datasetBusinessUids: [field.uid],
-        fieldAliasName: value,
-        moduleDatasetUid: datasetUid,
-        moduleUid: moduleId,
-        scope: 'FIELD_ALIAS_NAME',
-        uid: field.uid
-      }).then(function () {
-        if (component === 'table') {
-          var gridApi = ctx.componentMap.get(nodeId).api.self.ref.current.gridApi;
-          var col = gridApi.columnApi.getColumn(field.field);
-          col.colDef.headerName = value;
-          gridApi.api.refreshHeader();
-        } else if (['form', 'tableForm'].includes(component)) {
-          handleChange(reduce(fields, function (ret, _ref4) {
-            var fieldAliasName = _ref4.fieldAliasName,
-              _field = _objectWithoutProperties(_ref4, _excluded);
-            if (fieldAliasName) {
-              ret.push(_objectSpread({
-                aliasName: fieldAliasName
-              }, _field));
-            }
-            return ret;
-          }, []));
-        }
-      });
-    }, {
-      wait: 500
-    }),
-    run = _useDebounceFn.run;
   var handleSortChange = useMemoizedFn(function (sortItems, fromIndex, toIndex) {
     dispatch({
       type: 'sort',
@@ -184,9 +144,19 @@ var FieldsSetting = function FieldsSetting(_ref) {
         data: {
           fieldAliasName: value
         }
+      },
+      callback: function callback(newFields) {
+        if (component === 'table') {
+          setTimeout(function () {
+            var gridApi = ctx.componentMap.get(nodeId).api.self.ref.current.gridApi;
+            var col = gridApi.columnApi.getColumn(field.field);
+            col.colDef.headerName = value;
+            gridApi.api.refreshHeader();
+          });
+        }
+        handleChange(newFields);
       }
     });
-    run(field, value);
   });
   var handleFieldCheckChange = useMemoizedFn(function (e) {
     var _e$target = e.target,
@@ -220,7 +190,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
           uid: groupId,
           id: groupId,
           field: 'divider',
-          fieldAliasName: 'Group',
+          fieldName: 'Group',
           _type: 'divider'
         }
       },
@@ -287,8 +257,8 @@ var FieldsSetting = function FieldsSetting(_ref) {
     id: "".concat(_I18N_PREFIX_, ".title"),
     label: '标题'
   }))), /*#__PURE__*/React.createElement(SortBox, {
-    datas: fields.map(function (_ref5) {
-      var uid = _ref5.uid;
+    datas: fields.map(function (_ref4) {
+      var uid = _ref4.uid;
       return uid;
     }),
     onChange: handleSortChange

package/es/lowcode/view/lc-components/Dialog/index.js

@@ -1,7 +1,9 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _extends from "@babel/runtime/helpers/esm/extends";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { useRef, useEffect, useImperativeHandle } from 'react';
+import React, { useRef, useEffect, useImperativeHandle, useState } from 'react';
 import { useMemoizedFn, useUpdateEffect, useCreation } from 'ahooks';
 import { Modal, Button } from 'luck-design/antd';
 import classNames from 'classnames';
@@ -41,6 +43,10 @@ var LCDialog = function LCDialog(_ref) {
     _usePromiseState2 = _slicedToArray(_usePromiseState, 2),
     open = _usePromiseState2[0],
     setOpen = _usePromiseState2[1];
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
   var _usePromiseState3 = usePromiseState(title),
     _usePromiseState4 = _slicedToArray(_usePromiseState3, 2),
     _title = _usePromiseState4[0],
@@ -62,15 +68,29 @@ var LCDialog = function LCDialog(_ref) {
   useUpdateEffect(function () {
     _setTitle(title);
   }, [title]);
-  var handleOk = useMemoizedFn(function () {
-    ctx.doAction(advance.events.onOk);
-  });
+  var handleOk = useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          setLoading(true);
+          _context.next = 3;
+          return ctx.doAction(advance.events.onOk);
+        case 3:
+          setLoading(false);
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  })));
   var _footer = useCreation(function () {
     var _btnGroup$todoList;
     if (!footer) return {
       footer: null
     };
-    if (!(btnGroup !== null && btnGroup !== void 0 && (_btnGroup$todoList = btnGroup.todoList) !== null && _btnGroup$todoList !== void 0 && _btnGroup$todoList.length)) return {};
+    if (!(btnGroup !== null && btnGroup !== void 0 && (_btnGroup$todoList = btnGroup.todoList) !== null && _btnGroup$todoList !== void 0 && _btnGroup$todoList.length)) return {
+      confirmLoading: loading
+    };
     return {
       footer: /*#__PURE__*/React.createElement(Footer, null, /*#__PURE__*/React.createElement(LDActions, _extends({}, btnGroup, {
         doAction: function doAction(action) {
@@ -85,10 +105,11 @@ var LCDialog = function LCDialog(_ref) {
         }
       }, cancelText), /*#__PURE__*/React.createElement(Button, {
         type: "primary",
+        loading: loading,
         onClick: handleOk
       }, okText))
     };
-  }, [footer, btnGroup]);
+  }, [footer, btnGroup, loading]);
   var getTargetDom = useMemoizedFn(function () {
     var _domRef$current;
     return (_domRef$current = domRef.current) === null || _domRef$current === void 0 ? void 0 : _domRef$current.closest('.ant-modal-content');

package/es/lowcode/view/lc-components/Dialog/meta.json

@@ -142,7 +142,7 @@
       {
         "key": "onOk",
         "name": "确定按钮点击",
-        "desc": "点击确定按钮时，执行方法",
+        "desc": "点击确定按钮时，执行方法,return为Promose对象时会自动追加loading状态",
         "func": "function onOk() {\n\t\n}"
       }
     ]

package/es/lowcode/view/lc-components/FieldColor/meta.json

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "enableAlpha",
       "name": "启用透明度",
@@ -36,6 +41,78 @@
         }
       ],
       "default": "topLeft"
+    },
+    {
+      "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/es/lowcode/view/lc-components/FieldComplex/meta.json

@@ -7,11 +7,88 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "allowClear",
       "name": "允许清除",
       "type": "switch",
       "default": 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/es/lowcode/view/lc-components/FieldDate/meta.json

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "showTime",
       "name": "时间选择",
@@ -30,6 +35,78 @@
       "mustConfirm": true,
       "wrapper": "collapse",
       "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": {