@luck-design-biz/luckda 0.0.25-11 → 0.0.25-13

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

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "action",
       "name": "上传地址",
@@ -50,14 +55,92 @@
       "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": {
     "events": [
+      {
+        "key": "onValueChange",
+        "name": "数据变化事件",
+        "desc": "在数据变化事件时，执行方法",
+        "func": "function onValueChange(value, field, data, formProps) {\n\t\n}"
+      },
       {
         "key": "onChange",
-        "name": "上传文件改变时的状态",
-        "desc": "上传文件改变时的状态",
+        "name": "值变化事件(onChange)",
+        "desc": "原生onChange事件，在值发生变化时，执行方法",
         "func": "function onChange(e) {\n\t\n}"
       },
       {

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

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "allowClear",
       "name": "允许清除",
@@ -55,14 +60,92 @@
         }
       ],
       "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": {
     "events": [
       {
-        "key": "onChange",
+        "key": "onValueChange",
         "name": "数据变化事件",
         "desc": "在数据变化事件时，执行方法",
+        "func": "function onValueChange(value, field, data, formProps) {\n\t\n}"
+      },
+      {
+        "key": "onChange",
+        "name": "值变化事件(onChange)",
+        "desc": "原生onChange事件，在值发生变化时，执行方法",
         "func": "function onChange(value, extra) {\n\t\n}"
       },
       {

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

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "allowClear",
       "name": "允许清除",
@@ -20,14 +25,92 @@
       "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": {
     "events": [
       {
-        "key": "onChange",
+        "key": "onValueChange",
         "name": "数据变化事件",
-        "desc": "时间发生变化的回调，用户选择时间时触发",
+        "desc": "在数据变化事件时，执行方法",
+        "func": "function onValueChange(value, field, data, formProps) {\n\t\n}"
+      },
+      {
+        "key": "onChange",
+        "name": "值变化事件(onChange)",
+        "desc": "原生onChange事件，在值发生变化时，执行方法",
         "func": "function onChange(date, dateString) {\n\t\n}"
       }
     ]

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

@@ -14,9 +14,9 @@ import { formatMessage, getPageQuery } from '@luck-design-biz/base/utils';
 import Wrapper from "../Wrapper";
 import { LdFormList } from "../../../../index";
 import { omitBadProps, executeCode, getLDMetaAttr } from "../../../engine/tools/helper";
-import { useContext, useRemoteSource } from "../../../engine/provider/ContextProvider";
+import { useContext, useRemoteSource, modifyNode } from "../../../engine/provider/ContextProvider";
 import buildUploadForm from "../../../../upload/Form";
-import LdRuntimeCom from "../../../../components/LdRuntimeCom";
+import RuntimeComp from "../JSX/RuntimeComp";
 import defaultMeta from "../../../engine/meta/form.props.default.json";
 import styles from "./index.less";
 var _I18N_PREFIX_ = 'lc.form.validator';
@@ -66,12 +66,14 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     readOnly = _ref2.readOnly,
     showSave = _ref2.showSave,
     saveTitle = _ref2.saveTitle,
+    getContainer = _ref2.getContainer,
     settingLayout = _ref2.settingLayout,
     renderFormLeft = _ref2.renderFormLeft,
     renderFormRight = _ref2.renderFormRight,
     children = _ref2.children;
   var apiRef = useRef();
   var boxRef = useRef();
+  var promiseRef = useRef(null);
   var formRef = useRef();
   var ctx = useContext();
   var remoteSource = useRemoteSource();
@@ -85,15 +87,21 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
       return i.serial;
     })) || [];
   }, [remoteSource.serials]);
+  var _blocks = useCreation(function () {
+    return blocks.filter(function (_ref3) {
+      var hidden = _ref3.hidden;
+      return !hidden;
+    });
+  }, [blocks]);
   useMount(function () {
     ctx.doAction(advance.events.onMount, {
       instance: (ref || formRef).current
     });
   });
   useEffect(function () {
-    var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref3) {
-      var resource = _ref3.resource,
-        prevResource = _ref3.prevResource;
+    var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref4) {
+      var resource = _ref4.resource,
+        prevResource = _ref4.prevResource;
       ctx.doAction(advance.events.onPagePublicResourceChanged, {
         resource: resource,
         prevResource: prevResource,
@@ -121,15 +129,102 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
        * @method
        */
       submit: function submit() {
-        var _ctx$pagePublicResour;
+        return new Promise(function (resolve) {
+          var _ctx$pagePublicResour;
+          promiseRef.current = resolve;
+          var instance = (ref || formRef).current;
+          var _ref5 = ((_ctx$pagePublicResour = ctx.pagePublicResource) === null || _ctx$pagePublicResour === void 0 ? void 0 : _ctx$pagePublicResour[id]) || initData || _initData || {},
+            formMode = _ref5.formMode;
+          if (formMode === 'add') {
+            instance.onAdd();
+          } else if (formMode === 'update') {
+            instance.onBatchUpdate();
+          }
+        });
+      },
+      /**
+       * @typedef {Object} Field
+       * @property {Object} target - 字段引用
+       * @property {boolean} disabled - 字段不可维护
+       * @property {boolean} required - 字段必填
+       * @property {any} value - 字段值
+       */
+      /**
+       * @typedef {Object} Block
+       * @property {Object} target - 区块引用
+       * @property {function(fieldName): Field} getField - 获取区块下的表单域
+       */
+      /**
+       * 获取区块
+       * @param {*} blockId - 区块ID
+       * @returns {Block}
+       */
+      getBlock: function getBlock(blockId) {
         var instance = (ref || formRef).current;
-        var _ref4 = ((_ctx$pagePublicResour = ctx.pagePublicResource) === null || _ctx$pagePublicResour === void 0 ? void 0 : _ctx$pagePublicResour[id]) || initData || _initData || {},
-          formMode = _ref4.formMode;
-        if (formMode === 'add') {
-          instance.onAdd();
-        } else if (formMode === 'update') {
-          instance.onBatchUpdate();
+        var block = instance.formRefs[blockId];
+        if (!block) {
+          console.e('未发现区块');
+          return {};
         }
+        var getField = function getField(fieldName) {
+          if (block.current.props.type !== 'auto') {
+            console.e('该区块无法获取表单域');
+            return {};
+          }
+          var basicForm = block.current.props.wrappedComponentRef.current;
+          var field = basicForm.fieldsRef[fieldName];
+          if (!field) {
+            console.e("\u672A\u53D1\u73B0".concat(fieldName, "\u5B57\u6BB5"));
+            return {};
+          }
+          return new Proxy({
+            target: field
+          }, {
+            set: function set(_, property, receiver) {
+              if (['disabled', 'required'].includes(property)) {
+                var bi = blocks.findIndex(function (b) {
+                  return b.id === blockId;
+                });
+                var fi = blocks[bi].fields.findIndex(function (f) {
+                  return f.field === fieldName;
+                });
+                modifyNode(id, _defineProperty({}, "blocks[".concat(bi, "].fields[").concat(fi, "].config.").concat(property), receiver));
+              } else if ('value' === property) {
+                block.current.setFieldsValue(_defineProperty({}, fieldName, receiver));
+              }
+            },
+            get: function get(target, property, receiver) {
+              if (['disabled', 'required'].includes(property)) {
+                return field.props.config[property];
+              } else if ('value' === property) {
+                block.current.getFieldValue(fieldName);
+              }
+              return Reflect.get(target, property, receiver);
+            }
+          });
+        };
+        return new Proxy({
+          target: block.current,
+          getField: getField
+        }, {
+          set: function set(_, property, receiver) {
+            if (['hidden', 'readOnly'].includes(property)) {
+              var i = blocks.findIndex(function (b) {
+                return b.id === blockId;
+              });
+              modifyNode(id, _defineProperty({}, "blocks[".concat(i, "].").concat(property), receiver));
+            }
+          },
+          get: function get(target, property, receiver) {
+            if (['hidden', 'readOnly'].includes(property)) {
+              var item = blocks.find(function (b) {
+                return b.id === blockId;
+              });
+              return item === null || item === void 0 ? void 0 : item[property];
+            }
+            return Reflect.get(target, property, receiver);
+          }
+        });
       }
     };
   });
@@ -142,11 +237,12 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     };
     return executeCode(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
-  var handleDataSourceFormat = useMemoizedFn(function (dataSourceFormat, dataSetKey, _ref5) {
-    var values = _ref5.values,
-      submitData = _ref5.submitData;
+  var handleDataSourceFormat = useMemoizedFn(function (dataSourceFormat, dataSetKey, _ref6) {
+    var values = _ref6.values,
+      submitData = _ref6.submitData,
+      behaviorKey = _ref6.behaviorKey;
     if (isNil(dataSourceFormat)) return _defineProperty({}, dataSetKey, submitData);
-    return executeCode(ctx, dataSourceFormat, ['dataSetKey', 'values', 'submitData'], dataSetKey, values, submitData);
+    return executeCode(ctx, dataSourceFormat, ['dataSetKey', 'values', 'submitData', 'behaviorKey'], dataSetKey, values, submitData, behaviorKey);
   });
   var handleResetActionsColumn = useMemoizedFn(function (actionsColumnReset, data, index, actions, params) {
     return executeCode(ctx, actionsColumnReset, ['data', 'index', 'actions', 'params'], data, index, actions, params);
@@ -174,7 +270,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     if (!isNil(onUploadChange)) return executeCode(ctx, onUploadChange, ['event'], e);
   });
   var renderAffix = useMemoizedFn(function (_render) {
-    return _render ? /*#__PURE__*/React.createElement(LdRuntimeCom, null, _render) : null;
+    return _render ? /*#__PURE__*/React.createElement(RuntimeComp, null, _render) : null;
   });
   var setVerifyRules = function setVerifyRules(_props, verifyListObj) {
     var _verifyListObj$length, _verifyListObj$min, _verifyListObj$max, _verifyListObj$rules;
@@ -260,7 +356,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     })) || [];
   };
   var renderFormList = useMemoizedFn(function (formConfig) {
-    return reduce(blocks, function (result, item) {
+    return reduce(_blocks, function (result, item) {
       if (includes(['auto', 'grid', 'writer'], item.type) && includes(item.mode, formConfig.formMode)) {
         var _item$dataset;
         var data = {
@@ -312,7 +408,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     }, []);
   });
   var renderFormExtra = useMemoizedFn(function (formConfig) {
-    return reduce(blocks, function (result, item) {
+    return reduce(_blocks, function (result, item) {
       if (includes(item.mode, formConfig.formMode) && !item.serial || item.serialEffect === 'disable' || includes(serials, item.serial)) {
         if (item.type === 'uploadForm') {
           var dom = /*#__PURE__*/React.createElement(Header, {
@@ -370,7 +466,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   });
   var beforeSubmit = useMemoizedFn(function (values, data) {
     return new Promise( /*#__PURE__*/function () {
-      var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve) {
+      var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve) {
         var _data;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -398,7 +494,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
         }, _callee);
       }));
       return function (_x) {
-        return _ref7.apply(this, arguments);
+        return _ref8.apply(this, arguments);
       };
     }());
   });
@@ -454,7 +550,15 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     afterSubmit: advance.events.onSaveCallback ? afterSubmit : null,
     onValueChange: onValueChange,
     onChildChange: onChildChange,
-    setVerifyRules: setVerifyRules
+    setVerifyRules: setVerifyRules,
+    getContainer: isNil(getContainer) ? null : ctx.componentMap.get(getContainer).api.getSelfDom,
+    afterSubmitLoading: function afterSubmitLoading() {
+      var _promiseRef$current;
+      for (var _len5 = arguments.length, rest = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+        rest[_key5] = arguments[_key5];
+      }
+      return (_promiseRef$current = promiseRef.current) === null || _promiseRef$current === void 0 ? void 0 : _promiseRef$current.call.apply(_promiseRef$current, [promiseRef].concat(rest));
+    }
   })));
 });
 LCForm.defaultProps = omitBadProps(defaultMeta);

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

@@ -57,6 +57,17 @@
             ],
             "default": "bottom"
           },
+          {
+            "key": "getContainer",
+            "name": "挂载节点",
+            "desc": "指定功能区挂载的页面节点",
+            "type": "_ComponentSelector",
+            "filter": [
+              ["id", "page_root"],
+              ["meta.group", "container"],
+              ["meta.group", "build-in"]
+            ]
+          },
           {
             "key": "renderFormLeft",
             "name": "按钮区域左侧渲染",
@@ -204,7 +215,7 @@
               "suppressActions": false,
               "actionsColumnWidth": 160
             },
-            "uploadForm": { 
+            "uploadForm": {
               "readOnly": false,
               "suppressPreset": false,
               "height": "300px",
@@ -212,7 +223,7 @@
               "showNote": false,
               "zipName": "download",
               "useResetActions": false
-             }
+            }
           },
           "next": {
             "name": "区块详细设计",
@@ -335,7 +346,7 @@
                 "name": "格式化数据",
                 "desc": "格式化单表提交数据",
                 "type": "_JSEditor",
-                "defaultCode": "function dataSourceFormat(values, submitData) { \n return submitData; \n}",
+                "defaultCode": "function dataSourceFormat(dataSetKey, values, submitData, behaviorKey) { \n return { [dataSetKey]: { [`${behaviorKey}List`]: submitData } }; \n}",
                 "mustConfirm": true,
                 "wrapper": "collapse",
                 "wrapperProps": { "suppressIcon": true }
@@ -446,7 +457,7 @@
                 "name": "格式化数据",
                 "desc": "格式化单表提交数据",
                 "type": "_JSEditor",
-                "defaultCode": "function dataSourceFormat(values, submitData) { \n return submitData; \n}",
+                "defaultCode": "function dataSourceFormat(dataSetKey, values, submitData, behaviorKey) { \n return { [dataSetKey]: { [`${behaviorKey}List`]: submitData } }; \n}",
                 "mustConfirm": true,
                 "wrapper": "collapse",
                 "wrapperProps": { "suppressIcon": true }

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

@@ -37,7 +37,7 @@ var UploadDoneWrap = styled.div.withConfig({
   displayName: "UploadDoneWrap",
   componentId: "luckda-6530__sc-mil6cj-2"
 })(["display:flex;align-items:center;justify-content:center;flex-direction:column;padding:16px;"]);
-var LCButton = function LCButton(_ref) {
+var LCImex = function LCImex(_ref) {
   var id = _ref.id,
     title = _ref.title,
     type = _ref.type,
@@ -437,7 +437,7 @@ var LCButton = function LCButton(_ref) {
     download: true
   }, "\u4E0B\u8F7D\u51FA\u9519\u8868\u683C\u4FE1\u606F") : ''))));
 };
-LCButton.propTypes = {
+LCImex.propTypes = {
   /**
    * @name 唯一标识
    * @type string
@@ -476,5 +476,5 @@ LCButton.propTypes = {
    */
   block: PropTypes.bool
 };
-LCButton.defaultProps = omitBadProps(defaultMeta);
-export default LCButton;
+LCImex.defaultProps = omitBadProps(defaultMeta);
+export default LCImex;