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

package/lib/lowcode/engine/meta/fielduser.props.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/engine/meta/fieldyear.props.default.json

@@ -6,6 +6,8 @@
   "icon": "icon-fieldstring",
   "groupName": "表单项",
   "order": 1,
+  "col": 1,
+  "row": 1,
   "advance": {
     "events": {}
   }

package/lib/lowcode/engine/meta/fieldyear.props.json

@@ -7,6 +7,11 @@
   "groupName": "表单项",
   "order": 1,
   "props": [
+    {
+      "key": "fieldAliasName",
+      "name": "字段标题",
+      "type": "_I18nInput"
+    },
     {
       "key": "allowClear",
       "name": "允许清除",
@@ -22,14 +27,92 @@
       "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/engine/meta/form.props.json

@@ -57,6 +57,26 @@
             ],
             "default": "bottom"
           },
+          {
+            "key": "getContainer",
+            "name": "挂载节点",
+            "desc": "指定功能区挂载的页面节点",
+            "type": "_ComponentSelector",
+            "filter": [
+              [
+                "id",
+                "page_root"
+              ],
+              [
+                "meta.group",
+                "container"
+              ],
+              [
+                "meta.group",
+                "build-in"
+              ]
+            ]
+          },
           {
             "key": "renderFormLeft",
             "name": "按钮区域左侧渲染",
@@ -356,7 +376,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": {
@@ -482,7 +502,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": {

package/lib/lowcode/engine/meta/js-editor/auto-complete.json

@@ -98,13 +98,13 @@
     "completions": []
   },
   {
-    "name": "Image",
-    "triggerWord": "image",
+    "name": "ImEx",
+    "triggerWord": "imex",
     "completions": []
   },
   {
-    "name": "ImEx",
-    "triggerWord": "imex",
+    "name": "Image",
+    "triggerWord": "image",
     "completions": []
   },
   {

package/lib/lowcode/engine/meta/page.props.json

@@ -34,15 +34,15 @@
     "events": [
       {
         "key": "onPageMount",
-        "name": "组件首次渲染时",
-        "desc": "在组件首次渲染时，执行方法",
-        "func": "function onPageMount()=>{\n\t\n}"
+        "name": "页面首次渲染完成",
+        "desc": "在页面首次渲染完成时，执行方法",
+        "func": "function onPageMount(){\n\t\n}"
       },
       {
         "key": "onPageUnmount",
-        "name": "组件卸载时",
-        "desc": "在组件卸载时，执行方法。",
-        "func": "function onPageUnmount()=>{\n\t\n}"
+        "name": "页面卸载时",
+        "desc": "在页面卸载时，执行方法。",
+        "func": "function onPageUnmount(){\n\t\n}"
       }
     ]
   }

package/lib/lowcode/engine/provider/ContextProvider/index.js

@@ -173,7 +173,7 @@ var _default = exports.default = function _default(_ref) {
     value: ctx
   }, /*#__PURE__*/_react.default.createElement(_RemoteSourceProvider.default, {
     code: code,
-    runtime: eventBus.runtime,
+    eventBus: eventBus,
     debug: debug
   }, children));
 };

package/lib/lowcode/engine/provider/RemoteSourceProvider.js

@@ -13,18 +13,21 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _ahooks = require("ahooks");
+var _launcher = _interopRequireDefault(require("../launcher"));
 var _Builder = require("../../../components/Builder");
 var _action2 = require("../../../helper/action");
 var _usePageDataStore2 = _interopRequireDefault(require("../tools/usePageDataStore"));
+var _ContextProvider = require("../provider/ContextProvider");
 var _dataProcess = require("../tools/dataProcess");
 var _apiUrl = require("../../constants/api-url");
 var _constants = require("../../constants");
+var _eventTopics = require("../../constants/event-topics");
 var _helper = require("../tools/helper");
 var RemoteSourceContext = exports.RemoteSourceContext = /*#__PURE__*/(0, _react.createContext)(null);
 var _default = exports.default = function _default(_ref) {
   var children = _ref.children,
     code = _ref.code,
-    runtime = _ref.runtime,
+    eventBus = _ref.eventBus,
     debug = _ref.debug;
   var _usePageDataStore = (0, _usePageDataStore2.default)(function (state) {
       return {
@@ -36,6 +39,16 @@ var _default = exports.default = function _default(_ref) {
     initialize = _usePageDataStore.initialize,
     initializeModule = _usePageDataStore.initializeModule,
     reset = _usePageDataStore.reset;
+  var _useTemporalStore = (0, _ContextProvider.useTemporalStore)(function (state) {
+      return {
+        pause: state.pause,
+        resume: state.resume,
+        clear: state.clear
+      };
+    }),
+    pause = _useTemporalStore.pause,
+    resume = _useTemporalStore.resume,
+    clear = _useTemporalStore.clear;
   var _useSetState = (0, _ahooks.useSetState)({}),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     remoteSource = _useSetState2[0],
@@ -46,13 +59,18 @@ var _default = exports.default = function _default(_ref) {
     setRuntime = _useCookieState2[1];
   var prevRuntime = (0, _react.useRef)(cookieRuntime);
   (0, _ahooks.useCreation)(function () {
-    if (runtime !== cookieRuntime) {
+    !debug && (0, _launcher.default)();
+    pause();
+    if (eventBus.runtime !== cookieRuntime) {
       prevRuntime.current = cookieRuntime;
-      setRuntime(runtime);
+      setRuntime(eventBus.runtime);
     }
   }, []);
   (0, _ahooks.useUnmount)(function () {
-    !debug && reset();
+    if (!debug) {
+      reset();
+      clear();
+    }
     setRuntime(prevRuntime.current);
   });
 
@@ -63,7 +81,7 @@ var _default = exports.default = function _default(_ref) {
     fetchPageDataLoading = _useRequest.loading,
     runFetchPageData = _useRequest.runAsync;
   // 获取模块数据
-  var _useRequest2 = (0, _ahooks.useRequest)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants.RUNTIME.DESIGN, _apiUrl.fetchDesignModlueData), _constants.RUNTIME.PREVIEW, _apiUrl.fetchPreviewModlueData), _constants.RUNTIME.LIVE, _apiUrl.fetchModlueData)[runtime], {
+  var _useRequest2 = (0, _ahooks.useRequest)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _constants.RUNTIME.DESIGN, _apiUrl.fetchDesignModlueData), _constants.RUNTIME.PREVIEW, _apiUrl.fetchPreviewModlueData), _constants.RUNTIME.LIVE, _apiUrl.fetchModlueData)[eventBus.runtime], {
       manual: true,
       onSuccess: function onSuccess(_ref2) {
         var code = _ref2.code,
@@ -166,7 +184,7 @@ var _default = exports.default = function _default(_ref) {
         case 2:
           fetchPageDataRes = _context.sent;
           if (!(fetchPageDataRes.code === 1)) {
-            _context.next = 14;
+            _context.next = 15;
             break;
           }
           data = fetchPageDataRes.data, list = fetchPageDataRes.list, detail = fetchPageDataRes.detail;
@@ -191,8 +209,12 @@ var _default = exports.default = function _default(_ref) {
           runFetchAllSerials({
             uid: data.moduleId
           });
-          !debug && initialize((0, _dataProcess.decompress)(source));
-        case 14:
+          if (!debug) {
+            initialize((0, _dataProcess.decompress)(source));
+            resume();
+          }
+          eventBus.$publisher(_eventTopics.PAGE_LOAD_MOUNT);
+        case 15:
         case "end":
           return _context.stop();
       }

package/lib/lowcode/engine/tools/helper.js

@@ -5,15 +5,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.executeCode = executeCode;
+exports.extractKeywords = extractKeywords;
 exports.getCtx = getCtx;
 exports.getFuncBody = getFuncBody;
 exports.getLDMetaAttr = getLDMetaAttr;
 exports.isColor = isColor;
 exports.isPromise = isPromise;
 exports.listReducer = listReducer;
+exports.loadScript = loadScript;
 exports.omitBadProps = omitBadProps;
 exports.parseCSS = parseCSS;
 exports.setLDMetaAttrs = setLDMetaAttrs;
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _construct2 = _interopRequireDefault(require("@babel/runtime/helpers/construct"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -135,8 +138,8 @@ function executeCode(context, code, argsName) {
     throw new Error('executeCode参数不匹配');
   }
   var ctx = getCtx(context);
-  var func = (0, _construct2.default)(Function, (0, _toConsumableArray2.default)(argsName || []).concat(['ctx', getFuncBody(code)]));
-  return func.apply(void 0, args.concat([ctx]));
+  var func = (0, _construct2.default)(Function, (0, _toConsumableArray2.default)(argsName || []).concat(['ctx', 'window', getFuncBody(code)]));
+  return func.apply(void 0, args.concat([ctx, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, window.proxy), window)]));
 }
 function parseCSS(cssString) {
   // 创建一个空对象来存储解析后的样式
@@ -183,4 +186,60 @@ function getLDMetaAttr(name) {
     });
   }
   return params.get(name);
+}
+function extractKeywords(obj, keys) {
+  var keywords = [];
+  function recurse(currentObj) {
+    if ((0, _typeof2.default)(currentObj) !== 'object' || currentObj === null) {
+      return;
+    }
+    for (var key in currentObj) {
+      var _iterator = (0, _createForOfIteratorHelper2.default)(keys),
+        _step;
+      try {
+        tag: for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var triggerKey = _step.value;
+          var flag = (0, _lodash.isString)(triggerKey) ? key === triggerKey : (0, _lodash.has)(currentObj[key], triggerKey);
+          if (flag) {
+            var keyword = (0, _lodash.isString)(triggerKey) ? currentObj[triggerKey] : (0, _lodash.get)(currentObj[key], triggerKey);
+            keywords.push({
+              label: keyword,
+              kind: 'property',
+              insertText: keyword,
+              documentation: JSON.stringify(currentObj)
+            });
+            break tag;
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+      recurse(currentObj[key]);
+    }
+  }
+  recurse(obj);
+  return keywords;
+}
+function loadScript(path) {
+  var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var script = document.querySelector("script[src=\"".concat(path, "\"]"));
+  if (!script) {
+    var newScript = document.createElement('script');
+    newScript.src = path;
+    Object.keys(props).forEach(function (key) {
+      newScript[key] = props[key];
+    });
+    newScript.setAttribute('data-status', 'loading');
+    document.body.appendChild(newScript);
+    return {
+      ref: newScript,
+      status: 'loading'
+    };
+  }
+  return {
+    ref: script,
+    status: script.getAttribute('data-status') || 'ready'
+  };
 }

package/lib/lowcode/engine/tools/usePageDataStore.js

@@ -172,7 +172,7 @@ var usePageDataStore = (0, _zustand.create)()((0, _immer.immer)((0, _middleware.
     };
   },
   equality: function equality(pastState, newState) {
-    return !pastState.pageData || (0, _fastDeepEqual.default)(pastState, newState);
+    return (0, _fastDeepEqual.default)(pastState, newState);
   },
   handleSet: function handleSet(_handleSet2) {
     return (0, _lodash.debounce)(function (state) {
@@ -244,7 +244,11 @@ var modifyNode = exports.modifyNode = function modifyNode(id, data) {
       target = _ref3.target;
     if (!target) return;
     (0, _lodash.forOwn)((0, _lodash.omit)(data, ['id', 'parentId', 'component', 'buildIn']), function (_val, _key) {
-      (0, _lodash.set)(target.props, _key, _val);
+      if ((0, _lodash.isNil)(_val)) {
+        (0, _lodash.unset)(target.props, _key, _val);
+      } else {
+        (0, _lodash.set)(target.props, _key, _val);
+      }
     });
   });
 };
@@ -318,13 +322,14 @@ var getCanUndoAndRedo = exports.getCanUndoAndRedo = function getCanUndoAndRedo()
   };
 };
 var useTemporalStore = exports.useTemporalStore = function useTemporalStore(selector) {
+  var _temp$pastStates, _temp$futureStates;
   var temp = (0, _zustand.useStore)(usePageDataStore.temporal, selector);
   if (!temp) return {
     canUndo: false,
     canRedo: false
   };
-  var canUndo = !!temp.pastStates.length;
-  var canRedo = !!temp.futureStates.length;
+  var canUndo = !!((_temp$pastStates = temp.pastStates) !== null && _temp$pastStates !== void 0 && _temp$pastStates.length);
+  var canRedo = !!((_temp$futureStates = temp.futureStates) !== null && _temp$futureStates !== void 0 && _temp$futureStates.length);
   return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, temp), {}, {
     canUndo: canUndo,
     canRedo: canRedo

package/lib/lowcode/index.js

@@ -22,10 +22,6 @@ Object.defineProperty(exports, "View", {
     return _view.default;
   }
 });
-exports.default = launcher;
 var _painter = _interopRequireDefault(require("./painter"));
 var _view = _interopRequireDefault(require("./view"));
-var _preview = _interopRequireDefault(require("./preview"));
-// export * as dataProcess  from './engine/tools/dataProcess';
-
-function launcher() {}
+var _preview = _interopRequireDefault(require("./preview"));