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

package/es/lowcode/engine/meta/tabs.props.json

@@ -98,19 +98,19 @@
         "key": "onMount",
         "name": "组件首次渲染时",
         "desc": "在组件首次渲染时，执行方法",
-        "func": "(instance)=>{\n\t\n}"
+        "func": "function onMount() {\n\t\n}"
       },
       {
         "key": "onUnmount",
         "name": "组件卸载时",
         "desc": "在组件卸载时，执行方法。",
-        "func": "(instance)=>{\n\t\n}"
+        "func": "function onUnmount() {\n\t\n}"
       },
       {
         "key": "onTabClick",
         "name": "tab被点击的回调",
         "desc": "当tab被点击时, 执行方法",
-        "func": "(tabKey, e)=>{\n\t\n}"
+        "func": "function onTabClick(tabKey, e) {\n\t\n}"
       }
     ]
   }

package/es/lowcode/engine/meta/tree.props.default.json

@@ -15,6 +15,7 @@
   "showLine": false,
   "treeNodeTitle": "sname",
   "defaultExpandDeep": "0",
+  "cancelSelect": true,
   "showIcon": true,
   "treeNodeIcon": [],
   "showRootAdd": true,

package/es/lowcode/engine/meta/tree.props.json

@@ -17,7 +17,18 @@
       "key": "dataset",
       "name": "数据集",
       "desc": "选择系统中的可用树形数据集",
-      "type": "_DataSetSelector"
+      "type": "_DataSetSelector",
+      "next": {
+        "name": "字段配置",
+        "props": [
+          {
+            "key": "fields",
+            "name": "#字段配置器",
+            "type": "_FieldsSetting",
+            "component": "tree"
+          }
+        ]
+      }
     },
     {
       "key": "title",
@@ -119,6 +130,32 @@
         }
       ]
     },
+    {
+      "key": "selectSetting",
+      "name": "选中设置",
+      "type": "group",
+      "props": [
+        {
+          "key": "cancelSelect",
+          "name": "取消选中",
+          "desc": "是否可以取消选中",
+          "type": "switch",
+          "default": true
+        },
+        {
+          "key": "defaultSelect",
+          "name": "默认选中",
+          "desc": "返回默认选中的数据主键",
+          "type": "_JSEditor",
+          "defaultCode": "function defaultSelect(treeData) { \n return []; \n}",
+          "mustConfirm": true,
+          "wrapper": "collapse",
+          "wrapperProps": {
+            "suppressIcon": true
+          }
+        }
+      ]
+    },
     {
       "key": "IconSetting",
       "name": "图标设置",
@@ -279,31 +316,43 @@
         "key": "onMount",
         "name": "组件首次渲染时",
         "desc": "在组件首次渲染时，执行方法",
-        "func": "(params)=>{\n\t\n}"
+        "func": "function onMount(params) {\n\t\n}"
       },
       {
         "key": "onUnmount",
         "name": "组件卸载时",
         "desc": "在组件卸载时，执行方法。",
-        "func": "()=>{\n\t\n}"
+        "func": "function onUnmount() {\n\t\n}"
       },
       {
         "key": "processDataSource",
         "name": "数据预处理",
         "desc": "数据渲染前预处理",
-        "func": "(data)=>{\n\t\n}"
+        "func": "function processDataSource(data) {\n\t\n}"
       },
       {
         "key": "onDoubleClick",
         "name": "双击事件",
         "desc": "树节点双击事件",
-        "func": "(e, rowData)=>{\n\t\n}"
+        "func": "function onDoubleClick(e, rowData) {\n\t\n}"
       },
       {
         "key": "onCheck",
         "name": "复选框选择事件",
         "desc": "点击复选框触发",
-        "func": "(checkedKeys, e)=>{\n\t\n}"
+        "func": "function onCheck(checkedKeys, e) {\n\t\n}"
+      },
+      {
+        "key": "onSelect",
+        "name": "选中事件",
+        "desc": "节点选中事件",
+        "func": "function onSelect(checkedKeys, e) {\n\t\n}"
+      },
+      {
+        "key": "onDrop",
+        "name": "拖拽事件",
+        "desc": "节点拖拽事件",
+        "func": "function onDrop(info, dragInfo) {\n\t\n}"
       }
     ]
   }

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

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { createContext, useContext as useReactContext, useRef } from 'react';
 import { history } from 'umi';
-import { useMemoizedFn, useSetState } from 'ahooks';
+import { useMemoizedFn, useSetState, useUpdateEffect, usePrevious } from 'ahooks';
 import { useLDEventBus } from "../EventBusProvider";
 import RemoteSourceProvider, { RemoteSourceContext } from "../RemoteSourceProvider";
 import useTodo from "../../tools/useTodo";
@@ -18,7 +18,8 @@ export * from "../../tools/usePageDataStore";
 var PRIVATE_KEYS = ['componentList', 'componentMap'];
 export default (function (_ref) {
   var children = _ref.children,
-    code = _ref.code;
+    code = _ref.code,
+    debug = _ref.debug;
   var eventBus = useLDEventBus();
   var _useTodo = useTodo(),
     _useTodo2 = _slicedToArray(_useTodo, 3),
@@ -33,6 +34,7 @@ export default (function (_ref) {
     _useSetState2 = _slicedToArray(_useSetState, 2),
     pagePublicResource = _useSetState2[0],
     setPagePublicResource = _useSetState2[1];
+  var prevPagePublicResource = usePrevious(pagePublicResource);
 
   /**
    * 组件列表
@@ -94,6 +96,12 @@ export default (function (_ref) {
    * return:object
    */
   var getUrlParams = useMemoizedFn(function () {});
+  useUpdateEffect(function () {
+    eventBus.$publisher(topics.PAGE_PUBLIC_RESOURCE_CHANGED, {
+      resource: pagePublicResource,
+      prevResource: prevPagePublicResource
+    });
+  }, [pagePublicResource]);
   var ctx = new Proxy(_objectSpread({
     _register: _register,
     _unregister: _unregister,
@@ -140,6 +148,7 @@ export default (function (_ref) {
     value: ctx
   }, /*#__PURE__*/React.createElement(RemoteSourceProvider, {
     code: code,
-    runtime: eventBus.runtime
+    runtime: eventBus.runtime,
+    debug: debug
   }, children));
 });

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

@@ -11,13 +11,14 @@ import { LuckDaContext } from "../../../components/Builder";
 import { doAction as doActionUtils } from "../../../helper/action";
 import usePageDataStore from "../tools/usePageDataStore";
 import { decompress } from "../tools/dataProcess";
-import { fetchPageData, fetchDesignModlueData, fetchPreviewModlueData, fetchModlueData, fetchAllDataset, fetchAllSerials } from "../../constants/api-url";
+import { fetchPageData, fetchDesignModlueData, fetchPreviewModlueData, fetchModlueData, fetchAllDataset, fetchAllSerials, fetchAllBehaviorEx } from "../../constants/api-url";
 import { RUNTIME, COOKIE_RUNTIME_KEY, DATA_MODEL_CODE_KEY } from "../../constants";
 export var RemoteSourceContext = /*#__PURE__*/createContext(null);
 export default (function (_ref) {
   var children = _ref.children,
     code = _ref.code,
-    runtime = _ref.runtime;
+    runtime = _ref.runtime,
+    debug = _ref.debug;
   var _usePageDataStore = usePageDataStore(function (state) {
       return {
         initialize: state.initialize,
@@ -44,7 +45,7 @@ export default (function (_ref) {
     }
   }, []);
   useUnmount(function () {
-    reset();
+    !debug && reset();
     setRuntime(prevRuntime.current);
   });
 
@@ -106,6 +107,46 @@ export default (function (_ref) {
     fetchAllSerialsLoading = _useRequest4.loading,
     runFetchAllSerials = _useRequest4.run,
     refreshSerials = _useRequest4.refreshAsync;
+
+  // 获取导入导出行为下拉数据
+  var _useRequest5 = useRequest(fetchAllBehaviorEx, {
+      manual: true,
+      onSuccess: function onSuccess(_ref5) {
+        var code = _ref5.code,
+          data = _ref5.data;
+        if (code === 1) {
+          setRemoteSource({
+            impTypeList: data.map(function (item) {
+              return {
+                key: item.uid,
+                value: item.uid,
+                label: item.name
+              };
+            })
+          });
+        }
+      }
+    }),
+    runFetchAllBehaviorImport = _useRequest5.run;
+  var _useRequest6 = useRequest(fetchAllBehaviorEx, {
+      manual: true,
+      onSuccess: function onSuccess(_ref6) {
+        var code = _ref6.code,
+          data = _ref6.data;
+        if (code === 1) {
+          setRemoteSource({
+            expTypeList: data.map(function (item) {
+              return {
+                key: item.uid,
+                value: item.uid,
+                label: item.name
+              };
+            })
+          });
+        }
+      }
+    }),
+    runFetchAllBehaviorExport = _useRequest6.run;
   useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var fetchPageDataRes, data, list, detail, _detail$list$, source, info;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -118,7 +159,7 @@ export default (function (_ref) {
         case 2:
           fetchPageDataRes = _context.sent;
           if (!(fetchPageDataRes.code === 1)) {
-            _context.next = 13;
+            _context.next = 15;
             break;
           }
           data = fetchPageDataRes.data, list = fetchPageDataRes.list, detail = fetchPageDataRes.detail;
@@ -129,6 +170,14 @@ export default (function (_ref) {
             moduleCode: data.moduleCode
           });
         case 9:
+          runFetchAllBehaviorImport({
+            behaviorMode: 'IMPORT',
+            moduleCode: data.moduleCode
+          });
+          runFetchAllBehaviorExport({
+            behaviorMode: 'EXPORT',
+            moduleCode: data.moduleCode
+          });
           runFetchAllDataset({
             dataModelKey: data.dataModelKey
           });
@@ -140,8 +189,8 @@ export default (function (_ref) {
               relationship: data
             }, info)
           });
-          initialize(decompress(source));
-        case 13:
+          !debug && initialize(decompress(source));
+        case 15:
         case "end":
           return _context.stop();
       }

package/es/lowcode/engine/tools/dataProcess.js

@@ -39,6 +39,10 @@ export function decompress(compressedData) {
  */
 export function findNodeAndParent(id, current) {
   var parent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
+  if (!id) return {
+    node: null,
+    parent: null
+  };
   if (!parent && current.props.id === id) {
     return {
       node: current,

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

@@ -5,7 +5,7 @@ import { create } from 'zustand';
 import { immer } from 'zustand/middleware/immer';
 import { subscribeWithSelector } from 'zustand/middleware';
 import { useShallow } from 'zustand/react/shallow';
-import { isObject, isArray, isNil, isFunction, isString, get, set as _set, forOwn, omit } from 'lodash';
+import { isObject, isArray, isNil, isFunction, isString, get, set as _set, assign, forOwn, omit } from 'lodash';
 import { getPathNodesById, findNodeAndParent } from "./dataProcess";
 import { LC_BUILDIN_UNIT_KEY } from "../../constants";
 var findNode = function findNode(obj, id) {
@@ -159,7 +159,9 @@ export var useGet = function useGet(_) {
       });
     } else if (isObject(_) && _.id) {
       var _findNode2;
-      return _.id === LC_BUILDIN_UNIT_KEY.PAGE_ROOT ? state.pageData : (_findNode2 = findNode(state.pageData, _.id)) === null || _findNode2 === void 0 ? void 0 : _findNode2.target;
+      var path = _.path;
+      var _target = _.id === LC_BUILDIN_UNIT_KEY.PAGE_ROOT ? state.pageData : (_findNode2 = findNode(state.pageData, _.id)) === null || _findNode2 === void 0 ? void 0 : _findNode2.target;
+      return isNil(path) ? _target : get(_target, path);
     } else if (isString(_)) {
       return get(state.pageData, _);
     }

package/es/lowcode/painter/DesignOperator.js

@@ -186,7 +186,7 @@ var DesignOperator = function DesignOperator(_ref) {
         var node = context.componentMap.get(payload.id).api.getSelfData();
         setOperatorId({
           selector: payload.id,
-          deletable: node.props.buildIn !== true,
+          deletable: !node || node.props.buildIn !== true,
           detector: null
         });
       } else {

package/es/lowcode/painter/DesignToolbar.js

@@ -357,7 +357,8 @@ var DesignToolbar = function DesignToolbar(_ref) {
     }
   }, /*#__PURE__*/React.createElement(Preview, {
     code: location.query.code,
-    userId: userId || 'no-user'
+    userId: userId || 'no-user',
+    debug: true
   })));
 };
 export default DesignToolbar;

package/es/lowcode/painter/Panel.js

@@ -175,21 +175,21 @@ var Panel = function Panel() {
     className: styles.underline
   })), activeTabKey === _TAB_LIST_[0].key && /*#__PURE__*/React.createElement(AttrsPanel, {
     key: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
+    nodeId: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
     meta: meta,
-    value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node,
     onChange: function onChange(field, value, params) {
       return handleChange(field, value, params);
     }
   }), activeTabKey === _TAB_LIST_[1].key && /*#__PURE__*/React.createElement(StylePanel, {
     key: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
-    value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.css,
+    nodeId: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
     onChange: function onChange(_, newCss) {
       return handleChange('css', newCss);
     }
   }), activeTabKey === _TAB_LIST_[2].key && /*#__PURE__*/React.createElement(AdvancePanel, {
     key: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
+    nodeId: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.id,
     meta: meta,
-    value: activeNode === null || activeNode === void 0 ? void 0 : activeNode.node.advance,
     onChange: function onChange(val) {
       return handleChange('advance', val);
     }

package/es/lowcode/painter/components/ActionBindModal.js

@@ -1,10 +1,10 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useRef, useState } from 'react';
-import { useMemoizedFn, useLatest, useCreation, useMap, useUpdateEffect } from 'ahooks';
+import { useMemoizedFn, useLatest, useCreation, useMap, useUpdateEffect, useDebounceFn } from 'ahooks';
 import { Modal, Icon, Input, Checkbox, Tooltip } from 'luck-design/antd';
 import classNames from 'classnames';
-import { debounce, reduce } from 'lodash';
+import { reduce } from 'lodash';
 import { formatMessage } from '@luck-design-biz/base/utils';
 import { useRemoteSource } from "../../engine/provider/ContextProvider";
 import { useContext } from "../../engine/provider/ContextProvider";
@@ -98,18 +98,21 @@ var ActionBindModal = function ActionBindModal(_ref) {
   useUpdateEffect(function () {
     if (activeKey) {
       var action = get(activeKey);
-      editorRef.current.editor.setValue(action.code);
+      (action === null || action === void 0 ? void 0 : action.code) && editorRef.current.editor.setValue(action.code);
     }
   }, [activeKey]);
   useUpdateEffect(function () {
     setAll(event === null || event === void 0 ? void 0 : event.actionPool);
   }, [event]);
-  var handleEditorValueChange = useRef(debounce(function (code) {
-    if (latestActiveKey.current) {
-      var action = get(latestActiveKey.current);
-      action.code = code;
-    }
-  }, 400));
+  var _useDebounceFn = useDebounceFn(function (code) {
+      if (latestActiveKey.current) {
+        var action = get(latestActiveKey.current);
+        action.code = code;
+      }
+    }, {
+      wait: 500
+    }),
+    handleEditorValueChange = _useDebounceFn.run;
   var handleOptionClick = useMemoizedFn(function (key) {
     setActiveKey(key);
     var action;
@@ -162,7 +165,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
     },
     title: event === null || event === void 0 ? void 0 : event.name,
     visible: !!event,
-    width: 960,
+    width: "70vw",
     closable: false,
     maskClosable: false,
     getContainer: function getContainer() {
@@ -190,7 +193,16 @@ var ActionBindModal = function ActionBindModal(_ref) {
       className: classNames(_defineProperty({}, styles.active, key === category)),
       onClick: function onClick() {
         setCategory(key);
-        setActiveKey(void 0);
+        if ('custom' === key) {
+          setActiveKey('coding');
+          if (!actionPool.has(key)) {
+            set('coding', {
+              category: key,
+              key: 'coding',
+              code: event.func || defaultCode
+            });
+          }
+        }
       }
     }, label, key === category && /*#__PURE__*/React.createElement(Icon, {
       type: "check",
@@ -267,7 +279,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
     className: styles['code-box']
   }, activeKey ? /*#__PURE__*/React.createElement(JSEditor, {
     ref: editorRef,
-    onChange: handleEditorValueChange.current
+    onChange: handleEditorValueChange
   }) : formatMessage({
     id: "".concat(_I18N_PREFIX_, ".noActionSelected"),
     label: '请在右侧选择行为项'
@@ -278,7 +290,7 @@ var ActionBindModal = function ActionBindModal(_ref) {
     className: styles['code-box']
   }, activeKey ? /*#__PURE__*/React.createElement(JSEditor, {
     ref: editorRef,
-    onChange: handleEditorValueChange.current
+    onChange: handleEditorValueChange
   }) : formatMessage({
     id: "".concat(_I18N_PREFIX_, ".noActionSelected"),
     label: '请在右侧选择行为项'

package/es/lowcode/painter/components/AdvancePanel.js

@@ -9,6 +9,7 @@ import { useCreation, useMemoizedFn } from 'ahooks';
 import { Menu, Dropdown, Button, Tooltip, Icon } from 'luck-design/antd';
 import styled from 'styled-components';
 import { keyBy, keys, omit } from 'lodash';
+import { useGet } from "../../engine/provider/ContextProvider";
 import { formatMessage } from '@luck-design-biz/base/utils';
 import Collapse from "./Collapse";
 import ActionBindModal from "./ActionBindModal";
@@ -19,8 +20,12 @@ var EventItem = styled.div.withConfig({
 })(["display:flex;align-items:center;justify-content:space-between;padding:4px 8px;border:1px solid #e5e6e8;border-radius:6px;margin-bottom:6px;font-size:12px;i{color:rgba(0,0,0,0.4);cursor:pointer;}i:not(:last-child){margin-right:6px;}"]);
 var AdvancePanel = function AdvancePanel(_ref) {
   var meta = _ref.meta,
-    value = _ref.value,
+    nodeId = _ref.nodeId,
     onChange = _ref.onChange;
+  var value = useGet({
+    id: nodeId,
+    path: 'props.advance'
+  });
   var _useState = useState((value === null || value === void 0 ? void 0 : value.events) || {}),
     _useState2 = _slicedToArray(_useState, 2),
     events = _useState2[0],

package/es/lowcode/painter/components/AttrsPanel.js

@@ -8,7 +8,7 @@ import { useBoolean, useCreation, useMemoizedFn } from 'ahooks';
 import { Drawer, Icon } from 'luck-design/antd';
 import classNames from 'classnames';
 import { startsWith, isNil, get } from 'lodash';
-import { useContext } from "../../engine/provider/ContextProvider";
+import { useGet } from "../../engine/provider/ContextProvider";
 import PanelItemFactory from "../../engine/factory/panel-item-factory";
 import PanelItem from "./PanelItem";
 import Collapse from "./Collapse";
@@ -16,7 +16,7 @@ import styles from "../style/panel-attrs.less";
 var AttrsPanel = function AttrsPanel(_ref) {
   var _nextRef$current2, _nextRef$current3;
   var meta = _ref.meta,
-    value = _ref.value,
+    nodeId = _ref.nodeId,
     onChange = _ref.onChange;
   var nextRef = useRef(null);
   var factory = useRef(new PanelItemFactory());
@@ -26,7 +26,10 @@ var AttrsPanel = function AttrsPanel(_ref) {
     _useBoolean2$ = _useBoolean2[1],
     setTrue = _useBoolean2$.setTrue,
     setFalse = _useBoolean2$.setFalse;
-  var context = useContext();
+  var node = useGet({
+    id: nodeId,
+    path: 'props'
+  });
   var handleChange = useMemoizedFn(function (field, val, _ref2) {
     var _nextRef$current;
     var repositioning = _ref2.repositioning,
@@ -49,7 +52,6 @@ var AttrsPanel = function AttrsPanel(_ref) {
     setTrue();
   });
   var renderPanelItems = useMemoizedFn(function (items, dynamicProps) {
-    var node = context.componentMap.get(value.id).api.getSelfData();
     return items.map(function (_ref3) {
       var type = _ref3.type,
         key = _ref3.key,
@@ -66,7 +68,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
       var Comp = factory.current.getPanelItemFor(startsWith(type, '_') ? 'dynamic' : type, type);
       if (type === 'group') {
         return /*#__PURE__*/React.createElement(Comp, {
-          nodeId: value.id,
+          nodeId: nodeId,
           key: key,
           field: key,
           label: name,
@@ -77,9 +79,9 @@ var AttrsPanel = function AttrsPanel(_ref) {
           desc: desc
         }, renderPanelItems(props || [], dynamicProps));
       }
-      var _originalVal = get(node.props, valueKey || key);
+      var _originalVal = get(node, valueKey || key);
       var comp = Comp && /*#__PURE__*/React.createElement(Comp, _extends({
-        nodeId: value.id,
+        nodeId: nodeId,
         key: key,
         defaultValue: isNil(_originalVal) ? defaultValue : _originalVal,
         next: next !== null && next !== void 0 && next.props ? function (_dp) {
@@ -92,14 +94,14 @@ var AttrsPanel = function AttrsPanel(_ref) {
           });
         },
         size: "small",
-        settings: node.props,
+        settings: node,
         renderPanelItems: renderPanelItems
       }, rest, dynamicProps));
       if (wrapper === 'hidden') return comp;
       var Wrapper = wrapper === 'collapse' ? Collapse : PanelItem;
       return /*#__PURE__*/React.createElement(Wrapper, _extends({
         key: key,
-        nodeId: value.id,
+        nodeId: nodeId,
         field: key,
         label: name,
         desc: desc
@@ -112,7 +114,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
       return /*#__PURE__*/React.createElement(React.Fragment, null);
     }
     return renderPanelItems(meta.props);
-  }, [value]);
+  }, [nodeId]);
   useEffect(function () {
     if (!open) {
       nextRef.current = null;
@@ -120,7 +122,7 @@ var AttrsPanel = function AttrsPanel(_ref) {
   }, [open]);
   return /*#__PURE__*/React.createElement("div", {
     id: "lc-painter-panel-attrs-container",
-    className: classNames(styles['lc-painter-panel-attrs'], _defineProperty(_defineProperty({}, styles.hidden, !value), styles.showNext, open))
+    className: classNames(styles['lc-painter-panel-attrs'], _defineProperty(_defineProperty({}, styles.hidden, !nodeId), styles.showNext, open))
   }, PropsComps, /*#__PURE__*/React.createElement(Drawer, {
     visible: open,
     width: 320,