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

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

@@ -1,12 +1,13 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["id", "wrapperRef", "className", "dataset", "width", "height", "showLine", "defaultExpandDeep", "actions", "editable", "showRootAdd", "rootAddSetting", "doubleClickExpand", "onDoubleClick", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "onTreeNodeRender", "treeNodeIcon", "advance"];
-import React, { useRef, useImperativeHandle, forwardRef } from 'react';
+var _excluded = ["id", "wrapperRef", "className", "dataset", "width", "height", "showLine", "defaultExpandDeep", "actions", "editable", "showRootAdd", "onlyRoot", "rootAddSetting", "doubleClickExpand", "onDoubleClick", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "onTreeNodeRender", "treeNodeIcon", "advance", "cancelSelect", "defaultSelect"];
+import React, { useRef, useImperativeHandle, forwardRef, useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { useMemoizedFn, useCreation } from 'ahooks';
 import classNames from 'classnames';
-import { isNil } from 'lodash';
+import { isNil, keyBy } from 'lodash';
 import { IconFont } from '@luck-design-biz/base';
 import { suid } from '@luck-design-biz/base/utils';
 import { useContext } from "../../../engine/provider/ContextProvider";
@@ -15,6 +16,7 @@ import { LdTree } from "../../../../index";
 import { omitBadProps, executeCode } from "../../../engine/tools/helper";
 import defaultMeta from "../../../engine/meta/tree.props.default.json";
 import styles from "./index.less";
+var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
 var LCTree = function LCTree(_ref) {
   var id = _ref.id,
     wrapperRef = _ref.wrapperRef,
@@ -27,6 +29,7 @@ var LCTree = function LCTree(_ref) {
     actions = _ref.actions,
     editable = _ref.editable,
     showRootAdd = _ref.showRootAdd,
+    onlyRoot = _ref.onlyRoot,
     rootAddSetting = _ref.rootAddSetting,
     doubleClickExpand = _ref.doubleClickExpand,
     onDoubleClick = _ref.onDoubleClick,
@@ -36,16 +39,36 @@ var LCTree = function LCTree(_ref) {
     onTreeNodeRender = _ref.onTreeNodeRender,
     _treeNodeIcon = _ref.treeNodeIcon,
     advance = _ref.advance,
+    cancelSelect = _ref.cancelSelect,
+    defaultSelect = _ref.defaultSelect,
     props = _objectWithoutProperties(_ref, _excluded);
   var ctx = useContext();
   var boxRef = useRef();
   var treeRef = useRef();
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectedKeys = _useState2[0],
+    setSelectedKeys = _useState2[1];
   var getTargetDom = useMemoizedFn(function () {
     return boxRef.current;
   });
   useImperativeHandle(wrapperRef, function () {
     return treeRef.current;
   });
+  useEffect(function () {
+    var tid = ctx.$subscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED).on(function (_ref2) {
+      var resource = _ref2.resource,
+        prevResource = _ref2.prevResource;
+      ctx.doAction(advance.events.onPagePublicResourceChanged, {
+        resource: resource,
+        prevResource: prevResource,
+        instance: treeRef.current
+      });
+    }).watch();
+    return function () {
+      ctx.$unsubscriber(ctx.topics.PAGE_PUBLIC_RESOURCE_CHANGED, tid);
+    };
+  }, []);
   var handleMount = useMemoizedFn(function (params) {
     ctx.doAction(advance.events.onMount, {
       params: params
@@ -71,6 +94,12 @@ var LCTree = function LCTree(_ref) {
       e: e
     });
   });
+  var handleDrop = useMemoizedFn(function (info, dragInfo) {
+    ctx.doAction(advance.events.onCheck, {
+      info: info,
+      dragInfo: dragInfo
+    });
+  });
   var events = useCreation(function () {
     if (advance !== null && advance !== void 0 && advance.events) {
       var _events = {};
@@ -79,24 +108,31 @@ var LCTree = function LCTree(_ref) {
       if (advance.events.processDataSource) _events.dataToTreeFormat = handleProcessDataSource;
       if (advance.events.onDoubleClick) _events.onNodeDoubleClick = handleNodeDoubleClick;
       if (advance.events.onCheck) _events.onCheck = handleCheck;
+      if (advance.events.onDrop) _events.onDrop = handleDrop;
       return _events;
     }
     return {};
   }, [advance === null || advance === void 0 ? void 0 : advance.events]);
-  var handleDrop = useMemoizedFn(function (info, dragInfo) {
-    if (dragInfo !== false) {
-      // ctx.doAction(advance.events.onDoubleClick, { e, rowData });
-      // doAction('drag', {
-      //   get: { datasetCode: dataSetKey },
-      //   post: {
-      //     fromId: info.dragNode.props.dataRef[PRIMARY],
-      //     toId: info.node.props.dataRef[PRIMARY],
-      //   }
-      // }, {
-      //   showConfirm: false,
-      //   callback: (success) => success && onLdQuery()
-      // });
+  var handleSelect = useMemoizedFn(function (_selectedKeys, e) {
+    if (cancelSelect || e.selected) {
+      setSelectedKeys(_selectedKeys);
+      ctx.setPagePublicResource(_defineProperty({}, id, {
+        selectedNodes: e.selectedNodes
+      }));
     }
+    ctx.doAction(advance.events.onSelect, {
+      checkedKeys: _selectedKeys,
+      e: e
+    });
+  });
+  var afterInit = useMemoizedFn(function (treeData, data) {
+    var selected = !isNil(defaultSelect) ? executeCode(ctx, defaultSelect, ['treeData'], treeData) : null;
+    selected && handleSelect(selected, {
+      selected: true,
+      selectedNodes: selected.map(function (key) {
+        return keyBy(data, PRIMARY)[key];
+      })
+    });
   });
   return /*#__PURE__*/React.createElement(Wrapper, {
     id: id,
@@ -125,6 +161,7 @@ var LCTree = function LCTree(_ref) {
         return ctx.doAction(rootAddSetting.actionPool);
       }
     } : null,
+    onlyRoot: onlyRoot,
     rightMenus: function rightMenus() {
       return actions.todoList.map(function (action) {
         return {
@@ -173,7 +210,9 @@ var LCTree = function LCTree(_ref) {
     onTreeNodeRender: onTreeNodeRender ? function (title, i) {
       return executeCode(ctx, onTreeNodeRender, ['title', 'item'], title, i);
     } : null,
-    onDrop: handleDrop
+    selectedKeys: selectedKeys,
+    onSelect: handleSelect,
+    afterInit: afterInit
   }, events, props))));
 };
 LCTree.propTypes = {
@@ -257,6 +296,11 @@ LCTree.propTypes = {
    * @type bool
    */
   showRootAdd: PropTypes.bool,
+  /**
+   * @name 是否只有唯一一个根节点
+   * @type bool
+   */
+  onlyRoot: PropTypes.bool,
   /**
    * @name 根节点配置
    * @type object
@@ -325,7 +369,12 @@ LCTree.propTypes = {
    * @name 复选框选择事件
    * @type _JSEditor
    */
-  onCheck: PropTypes.string
+  onCheck: PropTypes.string,
+  /**
+   * @name 选中事件
+   * @type _JSEditor
+   */
+  onSelect: PropTypes.string
 };
 LCTree.defaultProps = omitBadProps(defaultMeta);
 export default /*#__PURE__*/forwardRef(function (props, ref) {

package/es/lowcode/view/lc-components/Tree/meta.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",
@@ -118,6 +129,31 @@
           "default": "0"
         }
       ]
+    }, {
+      "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",
@@ -168,6 +204,13 @@
                 "type": "switch",
                 "default": true
               },
+              {
+                "key": "onlyRoot",
+                "name": "根节点唯一",
+                "desc": "树组件仅一个根节点，如数据根节点数大于0，则不允许根节点新增",
+                "type": "switch",
+                "default": false
+              },
               {
                 "key": "rootAddSetting",
                 "name": "根节点配置",
@@ -270,32 +313,44 @@
         "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/view/lc-components/Wrapper.js

@@ -1,10 +1,8 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useEffect } from 'react';
 import { useLatest, useCreation } from 'ahooks';
 import { omit } from 'lodash';
-import { useContext, usePageData } from "../../engine/provider/ContextProvider";
-import { findNodeAndParent, getPathNodesById } from "../../engine/tools/dataProcess";
+import { useContext, useGet, getLevelNodes as _getLevelNodes, getSelfAndParent } from "../../engine/provider/ContextProvider";
 import { LC_COMPONENT_UNIT_KEY, LC_COMPONENT_UNIT, RUNTIME } from "../../constants";
 import DragDropWrapper from "../../painter/components/DragDrop/DragDropWrapper";
 var LCWrapper = function LCWrapper(_ref) {
@@ -14,23 +12,23 @@ var LCWrapper = function LCWrapper(_ref) {
     getTargetDom = _ref.getTargetDom,
     api = _ref.api;
   var ctx = useContext();
-  var _usePageData = usePageData(),
-    _usePageData2 = _slicedToArray(_usePageData, 1),
-    pageData = _usePageData2[0];
-  var _pageData = useLatest(pageData);
+  var selfData = useGet({
+    id: id
+  });
+  var _selfData = useLatest(selfData);
   useCreation(function () {
     var meta = displayName ? require("../../engine/meta/".concat(displayName.toLowerCase(), ".props.json")) : {};
     var _api = {
       self: children,
       getSelfData: function getSelfData() {
-        return children.props;
+        return _selfData.current;
       },
       getSelfDom: getTargetDom,
-      getSelfAndParentLCData: function getSelfAndParentLCData() {
-        return findNodeAndParent(id, _pageData.current);
+      getSelfAndParentData: function getSelfAndParentData() {
+        return getSelfAndParent(id);
       },
       getLevelNodes: function getLevelNodes() {
-        return getPathNodesById(_pageData.current, id);
+        return _getLevelNodes(id);
       }
     };
     ctx._register(id, new Proxy({

package/es/services.js

@@ -1,6 +1,5 @@
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import { stringify } from 'querystring';
 import { request } from '@luck-design-biz/base/utils';
 import api from "@/services/ApiConfig";
 export function readModlue(_x) {
@@ -21,27 +20,4 @@ function _readModlue() {
     }, _callee);
   }));
   return _readModlue.apply(this, arguments);
-}
-export function readBehaviorCall(_x2, _x3) {
-  return _readBehaviorCall.apply(this, arguments);
-}
-function _readBehaviorCall() {
-  _readBehaviorCall = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(get, post) {
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          return _context2.abrupt("return", request("".concat(api.API_HOST, "/lowcode/to/behavior/call?").concat(stringify(get)), {
-            method: 'POST',
-            body: post,
-            headers: {
-              'Content-Type': 'application/json;charset=UTF-8'
-            }
-          }));
-        case 1:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return _readBehaviorCall.apply(this, arguments);
 }