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

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

@@ -1,19 +1,23 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
 var _luckDesign = require("luck-design");
 var _base = require("@luck-design-biz/base");
+var _utils = require("@luck-design-biz/base/utils");
 var _Wrapper = _interopRequireDefault(require("../Wrapper"));
 var _index = require("../../../../index");
 var _helper = require("../../../engine/tools/helper");
@@ -22,6 +26,8 @@ var _Form = _interopRequireDefault(require("../../../../upload/Form"));
 var _LdRuntimeCom = _interopRequireDefault(require("../../../../components/LdRuntimeCom"));
 var _formPropsDefault = _interopRequireDefault(require("../../../engine/meta/form.props.default.json"));
 var _index2 = _interopRequireDefault(require("./index.less"));
+var _excluded = ["advance"];
+var _I18N_PREFIX_ = 'lc.form.validator';
 var Header = function Header(_ref) {
   var _ref$header = _ref.header,
     header = _ref$header === void 0 ? 'collapse' : _ref$header,
@@ -41,6 +47,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 = (0, _lodash.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__*/(0, _react.forwardRef)(function (_ref2, ref) {
   var _ctx$pagePublicResour2;
   var id = _ref2.id,
@@ -63,6 +83,10 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   var formRef = (0, _react.useRef)();
   var ctx = (0, _ContextProvider.useContext)();
   var remoteSource = (0, _ContextProvider.useRemoteSource)();
+  var _initData = (0, _ahooks.useCreation)(function () {
+    return (0, _utils.getPageQuery)();
+  }, []); // 获取主界面传递过来的详情页参数
+
   var serials = (0, _ahooks.useCreation)(function () {
     var _remoteSource$serials;
     return ((_remoteSource$serials = remoteSource.serials) === null || _remoteSource$serials === void 0 ? void 0 : _remoteSource$serials.map(function (i) {
@@ -74,21 +98,41 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
       instance: (ref || formRef).current
     });
   });
-  (0, _ahooks.useUnmount)(function () {
-    ctx.doAction(advance.events.onUnmount, {
-      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;
+      ctx.doAction(advance.events.onPagePublicResourceChanged, {
+        resource: resource,
+        prevResource: prevResource,
+        instance: (ref || formRef).current
+      });
+    }).watch();
+    return function () {
+      ctx.$unsubscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED, tid);
+      ctx.doAction(advance.events.onUnmount, {
+        instance: (ref || formRef).current
+      });
+    };
+  }, []);
   (0, _react.useImperativeHandle)(apiRef, function () {
     return {
-      getForm: function getForm() {
+      /**
+       * 获取表格实例
+       * @method
+       */
+      getInstance: function getInstance() {
         return (ref || formRef).current;
       },
+      /**
+       * 提交表格数据
+       * @method
+       */
       submit: function submit() {
         var _ctx$pagePublicResour;
         var instance = (ref || formRef).current;
-        var _ref3 = ((_ctx$pagePublicResour = ctx.pagePublicResource) === null || _ctx$pagePublicResour === void 0 ? void 0 : _ctx$pagePublicResour[id]) || initData || {},
-          formMode = _ref3.formMode;
+        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') {
@@ -106,11 +150,11 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     };
     return (0, _helper.executeCode)(ctx, defaultDataSourceFormat, ['defaultValues'], defaultValues);
   });
-  var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, _ref4) {
-    var values = _ref4.values,
-      submitData = _ref4.submitData;
-    if ((0, _lodash.isNil)(dataSourceFormat)) return submitData;
-    return (0, _helper.executeCode)(ctx, dataSourceFormat, ['values', 'submitData'], values, submitData);
+  var handleDataSourceFormat = (0, _ahooks.useMemoizedFn)(function (dataSourceFormat, dataSetKey, _ref5) {
+    var values = _ref5.values,
+      submitData = _ref5.submitData;
+    if ((0, _lodash.isNil)(dataSourceFormat)) return (0, _defineProperty2.default)({}, dataSetKey, submitData);
+    return (0, _helper.executeCode)(ctx, dataSourceFormat, ['dataSetKey', 'values', 'submitData'], dataSetKey, values, submitData);
   });
   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);
@@ -140,6 +184,89 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
   var renderAffix = (0, _ahooks.useMemoizedFn)(function (_render) {
     return _render ? /*#__PURE__*/_react.default.createElement(_LdRuntimeCom.default, null, _render) : null;
   });
+  var setVerifyRules = function setVerifyRules(_props, verifyListObj) {
+    var _verifyListObj$length, _verifyListObj$min, _verifyListObj$max, _verifyListObj$rules;
+    var props = (0, _lodash.cloneDeep)(_props);
+    props.config.rules = props.config.rules || [];
+    if ((_verifyListObj$length = verifyListObj.length) !== null && _verifyListObj$length !== void 0 && _verifyListObj$length.expression) props.config.rules.push({
+      validator: function validator(rule, value, callback) {
+        var _current;
+        var length = (0, _helper.executeCode)(ctx, verifyListObj.length.expression, ['cValue'], (_current = (ref || formRef).current) === null || _current === void 0 ? void 0 : _current.getCValue());
+        if (value.length > length) callback("".concat((0, _utils.formatMessage)({
+          id: "".concat(_I18N_PREFIX_, ".maxLength"),
+          label: '字数不得超过'
+        })).concat(length).concat((0, _utils.formatMessage)({
+          id: "".concat(_I18N_PREFIX_, ".textNum"),
+          label: '个字符'
+        })));
+        callback();
+      }
+    });
+    if ((_verifyListObj$min = verifyListObj.min) !== null && _verifyListObj$min !== void 0 && _verifyListObj$min.expression) props.config.rules.push({
+      validator: function validator(rule, value, callback) {
+        var _current2;
+        var min = (0, _helper.executeCode)(ctx, verifyListObj.min.expression, ['cValue'], (_current2 = (ref || formRef).current) === null || _current2 === void 0 ? void 0 : _current2.getCValue());
+        if (value < min) callback((0, _utils.formatMessage)({
+          id: "".concat(_I18N_PREFIX_, ".numberBelowMin"),
+          label: '低于最小值'
+        }));
+        callback();
+      }
+    });
+    if ((_verifyListObj$max = verifyListObj.max) !== null && _verifyListObj$max !== void 0 && _verifyListObj$max.expression) props.config.rules.push({
+      validator: function validator(rule, value, callback) {
+        var _current3;
+        var max = (0, _helper.executeCode)(ctx, verifyListObj.max.expression, ['cValue'], (_current3 = (ref || formRef).current) === null || _current3 === void 0 ? void 0 : _current3.getCValue());
+        if (value > max) callback((0, _utils.formatMessage)({
+          id: "".concat(_I18N_PREFIX_, ".numberExceedMax"),
+          label: '超过最大值'
+        }));
+        callback();
+      }
+    });
+    if (verifyListObj.email) props.config.type = 'email';
+    if (verifyListObj.idcard) props.config.type = 'idcard';
+    if (verifyListObj.mobile) props.config.type = 'mobile';
+    if ((_verifyListObj$rules = verifyListObj.rules) !== null && _verifyListObj$rules !== void 0 && _verifyListObj$rules.expression) props.config.rules.push({
+      validator: function validator(rule, value, callback) {
+        var _current4;
+        (0, _helper.executeCode)(ctx, verifyListObj.rules.expression, ['cValue', 'rule', 'value', 'callback'], (_current4 = (ref || formRef).current) === null || _current4 === void 0 ? void 0 : _current4.getCValue(), rule, value, callback);
+      }
+    });
+    return props;
+  };
+  var transEventsInfields = function transEventsInfields(fields) {
+    return fields.map(function (setting) {
+      var advance = setting.advance,
+        rest = (0, _objectWithoutProperties2.default)(setting, _excluded);
+      var props = (0, _lodash.reduce)(rest, function (result, value, key) {
+        //处理方法
+        result[key] = (0, _lodash.isString)(value) && (0, _lodash.startsWith)(value, 'function') ? function () {
+          for (var _len = arguments.length, _props = new Array(_len), _key = 0; _key < _len; _key++) {
+            _props[_key] = arguments[_key];
+          }
+          return _helper.executeCode.apply(void 0, [ctx, value, getMthodParams(value)].concat(_props));
+        } : value;
+        return result;
+      }, {});
+      if (advance !== null && advance !== void 0 && advance.events) return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
+        events: (0, _lodash.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, (0, _lodash.reduce)(getMthodParams(value[0][1].code), function (result, value, index) {
+              result[value] = props[index];
+              return result;
+            }, {}));
+          };
+          return result;
+        }, {})
+      });
+      return props;
+    });
+  };
   var renderFormList = (0, _ahooks.useMemoizedFn)(function (formConfig) {
     return (0, _lodash.reduce)(blocks, function (result, item) {
       if ((0, _lodash.includes)(['auto', 'grid', 'writer'], item.type) && (0, _lodash.includes)(item.mode, formConfig.formMode)) {
@@ -154,13 +281,14 @@ var LCForm = /*#__PURE__*/(0, _react.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);
           },
           onUpdate: {
             post: function post(data) {
-              return handleDataSourceFormat(item.dataSourceFormat, data);
+              var _item$dataset2;
+              return handleDataSourceFormat(item.dataSourceFormat, (_item$dataset2 = item.dataset) === null || _item$dataset2 === void 0 ? void 0 : _item$dataset2.code, data);
             }
           }
         };
@@ -195,7 +323,6 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     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 _remoteSource$pageinf;
           var dom = /*#__PURE__*/_react.default.createElement(Header, {
             ldId: item.id,
             key: item.id,
@@ -204,7 +331,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
             order: item.order
           }, (0, _Form.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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: (0, _helper.getLDMetaAttr)('moduleCode'),
             readOnly: item.readOnly || formConfig.readOnly || item.serial && !(0, _lodash.includes)(serials, item.serial),
             suppressPreset: item.suppressPreset,
             height: item.height,
@@ -213,8 +340,8 @@ var LCForm = /*#__PURE__*/(0, _react.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));
             },
@@ -222,8 +349,8 @@ var LCForm = /*#__PURE__*/(0, _react.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));
             },
@@ -250,16 +377,38 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     }, []);
   });
   var beforeSubmit = (0, _ahooks.useMemoizedFn)(function (values, data) {
-    return new Promise(function (resolve) {
-      if ((0, _lodash.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 = (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) {
+            case 0:
+              if (!(0, _lodash.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((0, _lodash.last)(_data));
+            case 8:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref7.apply(this, arguments);
+      };
+    }());
   });
   var afterSubmit = (0, _ahooks.useMemoizedFn)(function (success, mainKey, res) {
     ctx.doAction(advance.events.onSaveCallback, {
@@ -297,7 +446,7 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     renderFormList: renderFormList,
     renderFormExtra: renderFormExtra,
     mainFormLdId: "block_main",
-    initData: ((_ctx$pagePublicResour2 = ctx.pagePublicResource) === null || _ctx$pagePublicResour2 === void 0 ? void 0 : _ctx$pagePublicResour2[id]) || initData,
+    initData: ((_ctx$pagePublicResour2 = ctx.pagePublicResource) === null || _ctx$pagePublicResour2 === void 0 ? void 0 : _ctx$pagePublicResour2[id]) || initData || _initData,
     ref: ref || formRef,
     readOnly: readOnly,
     showSaveBtn: showSave,
@@ -312,7 +461,8 @@ var LCForm = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
     beforeSubmit: beforeSubmit,
     afterSubmit: advance.events.onSaveCallback ? afterSubmit : null,
     onValueChange: onValueChange,
-    onChildChange: onChildChange
+    onChildChange: onChildChange,
+    setVerifyRules: setVerifyRules
   })));
 });
 LCForm.defaultProps = (0, _helper.omitBadProps)(_formPropsDefault.default);

package/lib/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"
               }
             ]
           }
@@ -244,7 +244,7 @@
                 "name": "格式化数据",
                 "desc": "格式化单表提交数据",
                 "type": "_JSEditor",
-                "defaultCode": "function dataSourceFormat(values, submitData) { \n return submitData; \n}",
+                "defaultCode": "function dataSourceFormat(dataSetKey, values, submitData) { \n return { [dataSetKey]: submitData }; \n}",
                 "mustConfirm": true,
                 "wrapper": "collapse",
                 "wrapperProps": { "suppressIcon": true }
@@ -562,37 +562,43 @@
         "key": "onMount",
         "name": "组件首次渲染时",
         "desc": "在组件首次渲染时，执行方法",
-        "func": "(instance)=>{\n\t\n}"
+        "func": "function onMount(instance) {\n\t\n}"
       },
       {
         "key": "beforeSave",
         "name": "保存前置事件",
         "desc": "保存前置事件，promise，返回false取消执行",
-        "func": "(values, data) => {\n return values; \n}"
+        "func": "function beforeSave(values, data) {\n return values; \n}"
       },
       {
         "key": "onSaveCallback",
         "name": "保存后回调",
         "desc": "保存后回调事件",
-        "func": "(success, mainKey, res)=>{\n\t\n}"
+        "func": "function onSaveCallback(success, mainKey, res) {\n\t\n}"
       },
       {
         "key": "onUnmount",
         "name": "组件卸载时",
         "desc": "在组件卸载时，执行方法",
-        "func": "(instance)=>{\n\t\n}"
+        "func": "function onUnmount(instance) {\n\t\n}"
       },
       {
         "key": "onValueChange",
         "name": "参数变化的事件",
         "desc": "参数变化时，执行方法",
-        "func": "(change, data)=>{\n\t\n}"
+        "func": "function onValueChange(change, data) {\n\t\n}"
       },
       {
         "key": "onChildChange",
         "name": "表单内容发生改变时的回调",
         "desc": "表单内容发生改变时的回调",
-        "func": "(instance)=>{\n\t\n}"
+        "func": "function onChildChange(instance) {\n\t\n}"
+      },
+      {
+        "key": "onPagePublicResourceChanged",
+        "name": "页面共享资源变化后",
+        "desc": "当页面共享资源发生变化后（pagePublicResourceChanged），执行方法",
+        "func": "function onPagePublicResourceChanged(resource, prevResource, instance) {\n\t\n}"
       }
     ]
   }

package/lib/lowcode/view/lc-components/ImEx/FunctionDesign.js

@@ -5,13 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
+var _ahooks = require("ahooks");
 var _index = _interopRequireDefault(require("./index"));
-var _excluded = ["children"];
+var _excluded = ["className"];
 var FunctionDesign = function FunctionDesign(_ref) {
-  var children = _ref.children,
+  var className = _ref.className,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  return /*#__PURE__*/_react.default.createElement(_index.default, props, children);
+  var handleClick = (0, _ahooks.useMemoizedFn)(function () {});
+  return /*#__PURE__*/_react.default.createElement(_index.default, (0, _extends2.default)({
+    onClick: handleClick
+  }, props));
 };
 var _default = exports.default = FunctionDesign;