@luck-design-biz/luckda 0.0.25-8 → 0.0.25-9

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

@@ -1,15 +1,19 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+var _excluded = ["advance"];
 import React, { useRef, forwardRef, Fragment, useImperativeHandle, useEffect } from 'react';
 import { useMemoizedFn, useCreation, useMount } from 'ahooks';
 import classNames from 'classnames';
-import { reduce, includes, isNil, cloneDeep } from 'lodash';
+import { reduce, includes, isNil, cloneDeep, last, startsWith, isString } from 'lodash';
 import { BasicDivider } from 'luck-design';
 import { Collapse } from '@luck-design-biz/base';
 import { formatMessage, getPageQuery } from '@luck-design-biz/base/utils';
 import Wrapper from "../Wrapper";
 import { LdFormList } from "../../../../index";
-import { omitBadProps, executeCode } from "../../../engine/tools/helper";
+import { omitBadProps, executeCode, getLDMetaAttr } from "../../../engine/tools/helper";
 import { useContext, useRemoteSource } from "../../../engine/provider/ContextProvider";
 import buildUploadForm from "../../../../upload/Form";
 import LdRuntimeCom from "../../../../components/LdRuntimeCom";
@@ -35,6 +39,20 @@ var Header = function Header(_ref) {
     id: ldId
   }), children);
 };
+var getMthodParams = function getMthodParams(methodStr) {
+  var paramRegex = /\((.*?)\)/;
+  var match = methodStr.match(paramRegex);
+  if (match && match.length > 1) {
+    var paramStr = match[1];
+    var params = reduce(paramStr.split(','), function (result, param) {
+      var _param$trim;
+      if (((_param$trim = param.trim()) === null || _param$trim === void 0 ? void 0 : _param$trim.length) > 0) result.push(param.trim());
+      return result;
+    }, []);
+    return params;
+  }
+  return [];
+};
 var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
   var _ctx$pagePublicResour2;
   var id = _ref2.id,
@@ -209,6 +227,38 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     });
     return props;
   };
+  var transEventsInfields = function transEventsInfields(fields) {
+    return fields.map(function (setting) {
+      var advance = setting.advance,
+        rest = _objectWithoutProperties(setting, _excluded);
+      var props = reduce(rest, function (result, value, key) {
+        //处理方法
+        result[key] = isString(value) && startsWith(value, 'function') ? function () {
+          for (var _len = arguments.length, _props = new Array(_len), _key = 0; _key < _len; _key++) {
+            _props[_key] = arguments[_key];
+          }
+          return executeCode.apply(void 0, [ctx, value, getMthodParams(value)].concat(_props));
+        } : value;
+        return result;
+      }, {});
+      if (advance !== null && advance !== void 0 && advance.events) return _objectSpread(_objectSpread({}, props), {}, {
+        events: reduce(advance.events, function (result, value, key) {
+          //处理事件
+          result[key] = function () {
+            for (var _len2 = arguments.length, props = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+              props[_key2] = arguments[_key2];
+            }
+            ctx.doAction(value, reduce(getMthodParams(value[0][1].code), function (result, value, index) {
+              result[value] = props[index];
+              return result;
+            }, {}));
+          };
+          return result;
+        }, {})
+      });
+      return props;
+    });
+  };
   var renderFormList = useMemoizedFn(function (formConfig) {
     return reduce(blocks, function (result, item) {
       if (includes(['auto', 'grid', 'writer'], item.type) && includes(item.mode, formConfig.formMode)) {
@@ -223,7 +273,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
           dataSetKey: (_item$dataset = item.dataset) === null || _item$dataset === void 0 ? void 0 : _item$dataset.code,
           serial: item.serial,
           serialEffect: item.serialEffect,
-          fields: item.fields,
+          fields: transEventsInfields(item.fields),
           defaultDataSourceFormat: function defaultDataSourceFormat(defaultValues) {
             return handleDefaultDataSourceFormat(item.defaultDataSourceFormat, defaultValues);
           },
@@ -265,7 +315,6 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     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 _remoteSource$pageinf;
           var dom = /*#__PURE__*/React.createElement(Header, {
             ldId: item.id,
             key: item.id,
@@ -274,7 +323,7 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
             order: item.order
           }, buildUploadForm(_objectSpread(_objectSpread({}, formConfig), {}, {
             formId: item.id,
-            moduleCode: remoteSource === null || remoteSource === void 0 || (_remoteSource$pageinf = remoteSource.pageinfo) === null || _remoteSource$pageinf === void 0 || (_remoteSource$pageinf = _remoteSource$pageinf.relationship) === null || _remoteSource$pageinf === void 0 ? void 0 : _remoteSource$pageinf.moduleCode,
+            moduleCode: getLDMetaAttr('moduleCode'),
             readOnly: item.readOnly || formConfig.readOnly || item.serial && !includes(serials, item.serial),
             suppressPreset: item.suppressPreset,
             height: item.height,
@@ -283,8 +332,8 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
             zipName: "".concat(item.zipName || 'download', ".zip"),
             uploadUrl: item.uploadUrl,
             resetActions: item.useResetActions ? null : function () {
-              for (var _len = arguments.length, params = new Array(_len), _key = 0; _key < _len; _key++) {
-                params[_key] = arguments[_key];
+              for (var _len3 = arguments.length, params = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+                params[_key3] = arguments[_key3];
               }
               return handleResetActions.apply(void 0, [item.resetActions].concat(params));
             },
@@ -292,8 +341,8 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
               return handleForbiddenTypes(item.forbiddenTypes);
             },
             beforeUpload: function beforeUpload() {
-              for (var _len2 = arguments.length, params = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                params[_key2] = arguments[_key2];
+              for (var _len4 = arguments.length, params = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+                params[_key4] = arguments[_key4];
               }
               return handleBeforeUpload.apply(void 0, [item.beforeUpload].concat(params));
             },
@@ -320,15 +369,38 @@ var LCForm = /*#__PURE__*/forwardRef(function (_ref2, ref) {
     }, []);
   });
   var beforeSubmit = useMemoizedFn(function (values, data) {
-    return new Promise(function (resolve) {
-      if (isNil(advance.events.beforeSave)) resolve(values);else {
-        var _data = ctx.doAction(advance.events.beforeSave, {
-          values: values,
-          data: data
-        });
-        resolve(_data);
-      }
-    });
+    return new Promise( /*#__PURE__*/function () {
+      var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve) {
+        var _data;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (!isNil(advance.events.beforeSave)) {
+                _context.next = 4;
+                break;
+              }
+              resolve(values);
+              _context.next = 8;
+              break;
+            case 4:
+              _context.next = 6;
+              return ctx.doAction(advance.events.beforeSave, {
+                values: values,
+                data: data
+              });
+            case 6:
+              _data = _context.sent;
+              resolve(last(_data));
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref7.apply(this, arguments);
+      };
+    }());
   });
   var afterSubmit = useMemoizedFn(function (success, mainKey, res) {
     ctx.doAction(advance.events.onSaveCallback, {

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

@@ -105,14 +105,14 @@
           "name": "数据集",
           "desc": "选择系统中的可用树形数据集",
           "type": "_DataSetSelector",
+          "component": "form",
           "next": {
             "name": "字段配置",
             "props": [
               {
                 "key": "fields",
                 "name": "#字段配置器",
-                "type": "_FieldsSetting",
-                "component": "form"
+                "type": "_FieldsSetting"
               }
             ]
           }
@@ -598,7 +598,7 @@
         "key": "onPagePublicResourceChanged",
         "name": "页面共享资源变化后",
         "desc": "当页面共享资源发生变化后（pagePublicResourceChanged），执行方法",
-        "func": "function onPagePublicResourceChanged(resource, instance) {\n\t\n}"
+        "func": "function onPagePublicResourceChanged(resource, prevResource, instance) {\n\t\n}"
       }
     ]
   }