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

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

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "rows",
       "name": "行数",
@@ -22,27 +27,105 @@
       "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": {
     "events": [
       {
-        "key": "onChange",
+        "key": "onValueChange",
         "name": "数据变化事件",
-        "desc": "在数据变化时，执行方法",
-        "func": "function onChange(ev) {\n\t\n}"
+        "desc": "在数据变化事件时，执行方法",
+        "func": "function onValueChange(value, field, data, formProps) {\n\t\n}"
+      },
+      {
+        "key": "onChange",
+        "name": "值变化事件(onChange)",
+        "desc": "原生onChange事件，在值发生变化时，执行方法",
+        "func": "function onChange(e) {\n\t\n}"
       },
       {
         "key": "onBlur",
         "name": "失去焦点事件",
         "desc": "在失去焦点时，执行方法",
-        "func": "function onBlur(ev) {\n\t\n}"
+        "func": "function onBlur(e) {\n\t\n}"
       },
       {
         "key": "onFocus",
         "name": "获取焦点事件",
         "desc": "获取焦点时，执行方法",
-        "func": "function onFocus(ev) {\n\t\n}"
+        "func": "function onFocus(e) {\n\t\n}"
       }
     ]
   }

package/lib/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/lib/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/lib/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/lib/lowcode/view/lc-components/Form/index.js

@@ -23,7 +23,7 @@ var _index = require("../../../../index");
 var _helper = require("../../../engine/tools/helper");
 var _ContextProvider = require("../../../engine/provider/ContextProvider");
 var _Form = _interopRequireDefault(require("../../../../upload/Form"));
-var _LdRuntimeCom = _interopRequireDefault(require("../../../../components/LdRuntimeCom"));
+var _RuntimeComp = _interopRequireDefault(require("../JSX/RuntimeComp"));
 var _formPropsDefault = _interopRequireDefault(require("../../../engine/meta/form.props.default.json"));
 var _index2 = _interopRequireDefault(require("./index.less"));
 var _excluded = ["advance"];
@@ -74,12 +74,14 @@ var LCForm = /*#__PURE__*/(0, _react.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 = (0, _react.useRef)();
   var boxRef = (0, _react.useRef)();
+  var promiseRef = (0, _react.useRef)(null);
   var formRef = (0, _react.useRef)();
   var ctx = (0, _ContextProvider.useContext)();
   var remoteSource = (0, _ContextProvider.useRemoteSource)();
@@ -93,15 +95,21 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
       return i.serial;
     })) || [];
   }, [remoteSource.serials]);
+  var _blocks = (0, _ahooks.useCreation)(function () {
+    return blocks.filter(function (_ref3) {
+      var hidden = _ref3.hidden;
+      return !hidden;
+    });
+  }, [blocks]);
   (0, _ahooks.useMount)(function () {
     ctx.doAction(advance.events.onMount, {
       instance: (ref || formRef).current
     });
   });
   (0, _react.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,
@@ -129,15 +137,102 @@ var LCForm = /*#__PURE__*/(0, _react.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;
+                });
+                (0, _ContextProvider.modifyNode)(id, (0, _defineProperty2.default)({}, "blocks[".concat(bi, "].fields[").concat(fi, "].config.").concat(property), receiver));
+              } else if ('value' === property) {
+                block.current.setFieldsValue((0, _defineProperty2.default)({}, 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;
+              });
+              (0, _ContextProvider.modifyNode)(id, (0, _defineProperty2.default)({}, "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);
+          }
+        });
       }
     };
   });
@@ -150,11 +245,12 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     };
     return (0, _helper.executeCode)(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
-  var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, dataSetKey, _ref5) {
-    var values = _ref5.values,
-      submitData = _ref5.submitData;
+  var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, dataSetKey, _ref6) {
+    var values = _ref6.values,
+      submitData = _ref6.submitData,
+      behaviorKey = _ref6.behaviorKey;
     if ((0, _lodash.isNil)(dataSourceFormat)) return (0, _defineProperty2.default)({}, dataSetKey, submitData);
-    return (0, _helper.executeCode)(ctx, dataSourceFormat, ['dataSetKey', 'values', 'submitData'], dataSetKey, values, submitData);
+    return (0, _helper.executeCode)(ctx, dataSourceFormat, ['dataSetKey', 'values', 'submitData', 'behaviorKey'], dataSetKey, values, submitData, behaviorKey);
   });
   var handleResetActionsColumn = (0, _ahooks.useMemoizedFn)(function (actionsColumnReset, data, index, actions, params) {
     return (0, _helper.executeCode)(ctx, actionsColumnReset, ['data', 'index', 'actions', 'params'], data, index, actions, params);
@@ -182,7 +278,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     if (!(0, _lodash.isNil)(onUploadChange)) return (0, _helper.executeCode)(ctx, onUploadChange, ['event'], e);
   });
   var renderAffix = (0, _ahooks.useMemoizedFn)(function (_render) {
-    return _render ? /*#__PURE__*/_react.default.createElement(_LdRuntimeCom.default, null, _render) : null;
+    return _render ? /*#__PURE__*/_react.default.createElement(_RuntimeComp.default, null, _render) : null;
   });
   var setVerifyRules = function setVerifyRules(_props, verifyListObj) {
     var _verifyListObj$length, _verifyListObj$min, _verifyListObj$max, _verifyListObj$rules;
@@ -268,7 +364,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     })) || [];
   };
   var renderFormList = (0, _ahooks.useMemoizedFn)(function (formConfig) {
-    return (0, _lodash.reduce)(blocks, function (result, item) {
+    return (0, _lodash.reduce)(_blocks, function (result, item) {
       if ((0, _lodash.includes)(['auto', 'grid', 'writer'], item.type) && (0, _lodash.includes)(item.mode, formConfig.formMode)) {
         var _item$dataset;
         var data = {
@@ -320,7 +416,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     }, []);
   });
   var renderFormExtra = (0, _ahooks.useMemoizedFn)(function (formConfig) {
-    return (0, _lodash.reduce)(blocks, function (result, item) {
+    return (0, _lodash.reduce)(_blocks, function (result, item) {
       if ((0, _lodash.includes)(item.mode, formConfig.formMode) && !item.serial || item.serialEffect === 'disable' || (0, _lodash.includes)(serials, item.serial)) {
         if (item.type === 'uploadForm') {
           var dom = /*#__PURE__*/_react.default.createElement(Header, {
@@ -378,7 +474,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   });
   var beforeSubmit = (0, _ahooks.useMemoizedFn)(function (values, data) {
     return new Promise( /*#__PURE__*/function () {
-      var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(resolve) {
+      var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(resolve) {
         var _data;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -406,7 +502,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
         }, _callee);
       }));
       return function (_x) {
-        return _ref7.apply(this, arguments);
+        return _ref8.apply(this, arguments);
       };
     }());
   });
@@ -462,7 +558,15 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     afterSubmit: advance.events.onSaveCallback ? afterSubmit : null,
     onValueChange: onValueChange,
     onChildChange: onChildChange,
-    setVerifyRules: setVerifyRules
+    setVerifyRules: setVerifyRules,
+    getContainer: (0, _lodash.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 = (0, _helper.omitBadProps)(_formPropsDefault.default);