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

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
@@ -89,9 +90,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',
@@ -100,10 +103,10 @@ var DataSetSelector = function DataSetSelector(_ref) {
                     restProps.align = alignMapping[_extra.scell_alignment];
                     restProps.headerAlign = alignMapping[_extra.sheading_alignment];
                   }
-                  return {
+                  return (0, _objectSpread2.default)({
                     uid: f.uid,
                     field: f.field
-                  };
+                  }, restProps);
                 }));
               });
               setCurrentDataset(_ds);

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

@@ -1,12 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 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 _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"));
@@ -24,9 +23,8 @@ 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', 'aliasName'];
+var _PICK_KEYS_ = ['id', 'uid', 'field', 'width', 'align', 'headerAlign', 'pinned', 'tip', 'col', 'row', 'note', 'placeholder', 'fieldAliasName'];
 var Header = _styledComponents.default.div.withConfig({
   displayName: "Header",
   componentId: "luckda-6530__sc-gcwvp1-0"
@@ -97,9 +95,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',
@@ -131,46 +131,6 @@ var FieldsSetting = function FieldsSetting(_ref) {
       return _fieldData._type === 'divider' ? _fieldData : (0, _lodash.pick)(_fieldData, _PICK_KEYS_);
     }));
   });
-  var _useRequest2 = (0, _ahooks.useRequest)(_apiUrl.fetchUpdateFieldAttrs, {
-      manual: true
-    }),
-    runUpdateFieldAttrs = _useRequest2.runAsync;
-  var _useDebounceFn = (0, _ahooks.useDebounceFn)(function (field, value) {
-      var _getLDMetaAttr = (0, _helper.getLDMetaAttr)(['moduleId', 'dataModelKey']),
-        _getLDMetaAttr2 = (0, _slicedToArray2.default)(_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((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;
-          }, []));
-        }
-      });
-    }, {
-      wait: 500
-    }),
-    run = _useDebounceFn.run;
   var handleSortChange = (0, _ahooks.useMemoizedFn)(function (sortItems, fromIndex, toIndex) {
     dispatch({
       type: 'sort',
@@ -192,9 +152,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 = (0, _ahooks.useMemoizedFn)(function (e) {
     var _e$target = e.target,
@@ -228,7 +198,7 @@ var FieldsSetting = function FieldsSetting(_ref) {
           uid: groupId,
           id: groupId,
           field: 'divider',
-          fieldAliasName: 'Group',
+          fieldName: 'Group',
           _type: 'divider'
         }
       },
@@ -295,8 +265,8 @@ var FieldsSetting = function FieldsSetting(_ref) {
     id: "".concat(_I18N_PREFIX_, ".title"),
     label: '标题'
   }))), /*#__PURE__*/_react.default.createElement(_SortBox.SortBox, {
-    datas: fields.map(function (_ref5) {
-      var uid = _ref5.uid;
+    datas: fields.map(function (_ref4) {
+      var uid = _ref4.uid;
       return uid;
     }),
     onChange: handleSortChange

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

@@ -8,6 +8,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
@@ -49,6 +51,10 @@ var LCDialog = function LCDialog(_ref) {
     _usePromiseState2 = (0, _slicedToArray2.default)(_usePromiseState, 2),
     open = _usePromiseState2[0],
     setOpen = _usePromiseState2[1];
+  var _useState = (0, _react.useState)(false),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
   var _usePromiseState3 = (0, _usePromiseState5.default)(title),
     _usePromiseState4 = (0, _slicedToArray2.default)(_usePromiseState3, 2),
     _title = _usePromiseState4[0],
@@ -70,15 +76,29 @@ var LCDialog = function LCDialog(_ref) {
   (0, _ahooks.useUpdateEffect)(function () {
     _setTitle(title);
   }, [title]);
-  var handleOk = (0, _ahooks.useMemoizedFn)(function () {
-    ctx.doAction(advance.events.onOk);
-  });
+  var handleOk = (0, _ahooks.useMemoizedFn)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    return (0, _regeneratorRuntime2.default)().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 = (0, _ahooks.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.default.createElement(Footer, null, /*#__PURE__*/_react.default.createElement(_index.LDActions, (0, _extends2.default)({}, btnGroup, {
         doAction: function doAction(action) {
@@ -93,10 +113,11 @@ var LCDialog = function LCDialog(_ref) {
         }
       }, cancelText), /*#__PURE__*/_react.default.createElement(_antd.Button, {
         type: "primary",
+        loading: loading,
         onClick: handleOk
       }, okText))
     };
-  }, [footer, btnGroup]);
+  }, [footer, btnGroup, loading]);
   var getTargetDom = (0, _ahooks.useMemoizedFn)(function () {
     var _domRef$current;
     return (_domRef$current = domRef.current) === null || _domRef$current === void 0 ? void 0 : _domRef$current.closest('.ant-modal-content');

package/lib/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/lib/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/lib/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/lib/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": {

package/lib/lowcode/view/lc-components/FieldDict/meta.json

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "display",
       "name": "展现形式",
@@ -29,6 +34,78 @@
       "desc": "仅在展现形式为Select时有效",
       "type": "switch",
       "default": false
+    },
+    {
+      "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/view/lc-components/FieldEditor/meta.json

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "resize",
       "name": "拖拽大小",
@@ -23,6 +28,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": {