@luck-design-biz/luckda 0.0.24-2 → 0.0.25-1

package/lib/components/LdTree/index.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
@@ -23,8 +23,9 @@ var _base = require("@luck-design-biz/base");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils2 = require("../../utils");
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat"],
+var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service", "dataToTreeFormat", "boxRef", "doubleClickExpand", "onNodeDoubleClick", "width", "height", "treeNodeCheckable", "treeNodeDisableCheckbox", "treeNodeDisable", "treeNodeIcon", "asyncLoad", "parentKey", "onMount", "onUnmount", "onDataSetChange", "onTreeNodeRender"],
   _excluded2 = ["onClick"];
+var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
 var LdTree = function LdTree(_ref) {
   var columns = _ref.columns,
     resources = _ref.resources,
@@ -53,9 +54,24 @@ var LdTree = function LdTree(_ref) {
     isTree = _ref.isTree,
     service = _ref.service,
     dataToTreeFormat = _ref.dataToTreeFormat,
+    boxRef = _ref.boxRef,
+    doubleClickExpand = _ref.doubleClickExpand,
+    onNodeDoubleClick = _ref.onNodeDoubleClick,
+    width = _ref.width,
+    height = _ref.height,
+    treeNodeCheckable = _ref.treeNodeCheckable,
+    treeNodeDisableCheckbox = _ref.treeNodeDisableCheckbox,
+    treeNodeDisable = _ref.treeNodeDisable,
+    treeNodeIcon = _ref.treeNodeIcon,
+    asyncLoad = _ref.asyncLoad,
+    parentKey = _ref.parentKey,
+    onMount = _ref.onMount,
+    onUnmount = _ref.onUnmount,
+    onDataSetChange = _ref.onDataSetChange,
+    onTreeNodeRender = _ref.onTreeNodeRender,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   if (!(0, _lodash.includes)(isTree, dataSetKey)) return (0, _utils.formatMessage)({
-    id: 'luckda.ldTree.notTres',
+    id: 'luckda.ldTree.notTrees',
     label: '此数据集非树形数据集，请选择树形数据集'
   });
   var _useState = (0, _react.useState)(null),
@@ -67,11 +83,15 @@ var LdTree = function LdTree(_ref) {
     defaultExpandedProps = _useState4[0],
     setDefaultExpandedProps = _useState4[1];
   var treeRef = (0, _react.useRef)(null);
-  var defaultParams = [(0, _objectSpread2.default)({
-    moduleCode: moduleCode,
-    datasetCode: dataSetKey,
-    behaviorKey: 'readTree'
-  }, _defaultParmas)];
+  var defaultParams = (0, _ahooks.useCreation)(function () {
+    var _params = [(0, _objectSpread3.default)({
+      moduleCode: moduleCode,
+      datasetCode: dataSetKey,
+      behaviorKey: 'readTree'
+    }, _defaultParmas)];
+    if (asyncLoad) _params[0][parentKey] = 0;
+    return _params;
+  }, []);
   var _useRequest = (0, _ahooks.useRequest)(service || _utils2.behaviorCall, {
       // 获取树数据源
       defaultParams: defaultParams,
@@ -107,14 +127,24 @@ var LdTree = function LdTree(_ref) {
     loading = _useRequest.loading,
     run = _useRequest.run,
     params = _useRequest.params;
+  var onLdQuery = (0, _ahooks.useMemoizedFn)(function () {
+    var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    run((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, params[0]), _params), defaultParams[0]));
+  });
   (0, _react.useImperativeHandle)(wrapperRef, function () {
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, treeRef.current), {}, {
-      onLdQuery: function onLdQuery() {
-        var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        run((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params[0]), _params), defaultParams[0]));
-      }
+    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, treeRef.current), {}, {
+      onLdQuery: onLdQuery
     });
   });
+  (0, _react.useLayoutEffect)(function () {
+    onMount && onMount((0, _objectSpread3.default)((0, _objectSpread3.default)({}, params[0]), defaultParams[0]));
+    return function () {
+      onUnmount && onUnmount();
+    };
+  }, []);
+  (0, _react.useLayoutEffect)(function () {
+    onDataSetChange && onDataSetChange(onLdQuery);
+  }, [dataSetKey]);
   var handleMenuClick = function handleMenuClick(menu, data) {
     var onClick = menu.onClick,
       other = (0, _objectWithoutProperties2.default)(menu, _excluded2);
@@ -127,7 +157,8 @@ var LdTree = function LdTree(_ref) {
           return handleMenuClick(menu, data);
         },
         className: _index.default.rightMenu,
-        key: menu.key
+        key: menu.key,
+        style: menu.style
       }, menu.name || '');
     });
   };
@@ -147,11 +178,23 @@ var LdTree = function LdTree(_ref) {
       type: "more"
     }));
   };
+  var handleNodeDoubleClick = (0, _ahooks.useMemoizedFn)(function (e) {
+    var switcher = e.currentTarget.closest('li').querySelector('.ant-tree-switcher');
+    switcher.click();
+  });
+  var handleDoubleClick = (0, _ahooks.useMemoizedFn)(function (e, rowData) {
+    if (doubleClickExpand) handleNodeDoubleClick(e);
+    if (onNodeDoubleClick) onNodeDoubleClick(e, rowData);
+  });
   var renderTitleNode = function renderTitleNode(data, unSelectable) {
     var nodeTitle = (0, _lodash.isFunction)(treeNodeTitle) ? treeNodeTitle(data) : data[treeNodeTitle];
+    if (onTreeNodeRender) nodeTitle = onTreeNodeRender(nodeTitle, data);
     return /*#__PURE__*/_react.default.createElement("div", {
       className: _index.default.nodeTitle,
-      key: data[rowKey]
+      key: data[rowKey],
+      onDoubleClick: function onDoubleClick(e) {
+        return handleDoubleClick(e, data);
+      }
     }, /*#__PURE__*/_react.default.createElement("div", {
       title: nodeTitle,
       className: (0, _classnames.default)((0, _defineProperty2.default)({}, _index.default.nodeTitleDisabled, unSelectable))
@@ -161,21 +204,24 @@ var LdTree = function LdTree(_ref) {
     return data.map(function (item) {
       // 判断是否可选择
       var unSelectable = (0, _lodash.isFunction)(unselectableNodes) ? unselectableNodes(item) : unselectableNodes.includes(item[rowKey]);
-      if (item.children) {
-        return /*#__PURE__*/_react.default.createElement(_luckDesign.LuckTree.TreeNode, {
-          isLeaf: false,
-          title: renderTitleNode(item, unSelectable),
-          key: item[rowKey],
-          dataRef: item,
-          selectable: !unSelectable
-        }, renderTreeNodes(item.children));
-      }
-      return /*#__PURE__*/_react.default.createElement(_luckDesign.LuckTree.TreeNode, {
+      var props = {
         title: renderTitleNode(item, unSelectable),
         key: item[rowKey],
         dataRef: item,
-        selectable: !unSelectable
-      });
+        selectable: !unSelectable,
+        checkable: treeNodeCheckable && treeNodeCheckable(item),
+        disableCheckbox: treeNodeDisableCheckbox && treeNodeDisableCheckbox(item),
+        disabled: treeNodeDisable && treeNodeDisable(item)
+      };
+      if (treeNodeIcon && !(0, _lodash.isNil)(treeNodeIcon(item))) props.icon = treeNodeIcon(item);
+      if (!item.isleaf) {
+        return /*#__PURE__*/_react.default.createElement(_luckDesign.LuckTree.TreeNode, (0, _extends2.default)({
+          isLeaf: false
+        }, props), renderTreeNodes(item.children || []));
+      }
+      return /*#__PURE__*/_react.default.createElement(_luckDesign.LuckTree.TreeNode, (0, _extends2.default)({
+        isLeaf: true
+      }, props));
     });
   });
   var handleDrop = (0, _ahooks.useMemoizedFn)(function (info) {
@@ -187,19 +233,51 @@ var LdTree = function LdTree(_ref) {
       return handleMenuClick(rootAdd);
     } : null;
   }, [readOnly, rootAdd, resources]);
+  var onLoadData = (0, _ahooks.useMemoizedFn)(function (treeNode) {
+    return new Promise(function (resolve) {
+      console.log('treeNode.props.children', treeNode.props.children);
+      if (treeNode.props.isLeaf) {
+        resolve();
+        return;
+      }
+      (service || _utils2.behaviorCall)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, params[0]), {}, (0, _defineProperty2.default)({}, parentKey, treeNode.props.dataRef[window.appConfig.constraintKeys.PRIMARY]))).then(function (res) {
+        console.log(res);
+      });
+      // setTimeout(() => {
+      //   treeNode.props.dataRef.children = [
+      //     { title: 'Child Node', key: `${treeNode.props.eventKey}-0` },
+      //     { title: 'Child Node', key: `${treeNode.props.eventKey}-1` },
+      //   ];
+      //   this.setState({
+      //     treeData: [...this.state.treeData],
+      //   });
+      //   resolve();
+      // }, 1000);
+    });
+  });
+  var asyncLoadData = (0, _ahooks.useCreation)(function () {
+    return asyncLoad ? {
+      loadData: onLoadData
+    } : {};
+  }, []);
   return /*#__PURE__*/_react.default.createElement(_base.TreeBox, {
     suppressTitle: !title,
     title: title,
     loading: loading,
     id: ldId,
     onAdd: onAdd,
-    className: className
+    className: className,
+    ref: boxRef,
+    style: {
+      width: width,
+      height: height
+    }
   }, dataSource && /*#__PURE__*/_react.default.createElement(_luckDesign.LuckTree, (0, _extends2.default)({
     blockNode: true,
     className: (0, _classnames.default)(_index.default.tree, (0, _defineProperty2.default)({}, className, !!treeClassName)),
     draggable: !readOnly && draggable,
     onDrop: handleDrop
-  }, defaultExpandedProps, props, {
+  }, asyncLoadData, defaultExpandedProps, props, {
     ref: treeRef
   }), renderTreeNodes(dataSource)));
 };
@@ -231,7 +309,9 @@ Index.propTypes = {
   // 行为
   suppressInit: _propTypes.default.bool,
   // 抑制初始化
-  afterInit: _propTypes.default.func // 初始化后
+  afterInit: _propTypes.default.func,
+  // 初始化后
+  parentKey: _propTypes.default.string
 };
 Index.defaultProps = {
   readOnly: false,
@@ -246,7 +326,8 @@ Index.defaultProps = {
     return [];
   },
   suppressInit: false,
-  defaultParmas: {}
+  defaultParmas: {},
+  parentKey: 'iparentid'
 };
 var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({

package/lib/components/LdTree/index.less

@@ -3,6 +3,7 @@
     display: flex;
     align-items: center;
     width: 100%;
+    user-select: none;
 
     div {
       flex: 1;
@@ -10,9 +11,11 @@
       white-space: nowrap;
       text-overflow: ellipsis;
     }
+
     div.nodeTitleDisabled {
       color: var(--luck-text-color-disabled);
     }
+
     div.nodeTitleDisabled:hover {
       cursor: not-allowed;
     }
@@ -24,13 +27,15 @@
     }
   }
 }
+
 .classTreeOperates {
   :global(.ant-popover-inner-content) {
     padding: 0;
   }
+
   .rightMenu {
     display: block;
     padding: 4px 8px;
     color: var(--luck-text-color-);
   }
-}
+}

package/lib/helper/ldBuilder.js

@@ -13,7 +13,10 @@ var _utils = require("@luck-design-biz/base/utils");
 var builder = function builder(wrapped) {
   var LdCom = function LdCom(props) {
     var ldId = props.ldId,
-      dataSetKey = props.dataSetKey;
+      dataSetKey = props.dataSetKey,
+      wrapper = props.wrapper,
+      className = props.className,
+      style = props.style;
     var _ref = (0, _react.useContext)(_Builder.LuckDaContext) || {},
       resources = _ref.resources,
       actions = _ref.actions,
@@ -24,22 +27,35 @@ var builder = function builder(wrapped) {
       doAction = _ref.doAction,
       moduleCode = _ref.moduleCode; // 读存储的模块信息，包括行为、行为执行方法、数据集
 
-    if (!ldId) return (0, _utils.formatMessage)({
+    if (!ldId) return /*#__PURE__*/_react.default.createElement("span", {
+      ref: wrapper,
+      className: className,
+      style: style
+    }, (0, _utils.formatMessage)({
       id: 'luckda.paramMiss.ldId',
       label: '配置项缺少组件唯一标识(ldId)'
-    });
-    if (!dataSetKey) return (0, _utils.formatMessage)({
+    }));
+    if (!dataSetKey) return /*#__PURE__*/_react.default.createElement("span", {
+      ref: wrapper,
+      className: className,
+      style: style
+    }, (0, _utils.formatMessage)({
       id: 'luckda.paramMiss.dataSetKey',
       label: '缺少数据集(dataSetKey)'
-    });
-    if (!dataSets[dataSetKey]) return "".concat((0, _utils.formatMessage)({
-      // 待获取数据源
-      id: 'luckda.module.miss',
-      label: '该模块下缺少'
-    })).concat(dataSetKey).concat((0, _utils.formatMessage)({
-      id: 'luckda.parmas.dataSet',
-      label: '数据集'
     }));
+    if (!dataSets[dataSetKey])
+      // 待获取数据源
+      return /*#__PURE__*/_react.default.createElement("span", {
+        ref: wrapper,
+        className: className,
+        style: style
+      }, (0, _utils.formatMessage)({
+        id: 'luckda.module.miss',
+        label: '该模块下缺少'
+      }), dataSetKey, (0, _utils.formatMessage)({
+        id: 'luckda.parmas.dataSet',
+        label: '数据集'
+      }));
     var wrappedProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
       columns: dataSets[dataSetKey],
       isTree: isTree,

package/lib/helper/ldComBuild.js

@@ -6,16 +6,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ldComBuilder = exports.getResources = exports.filterOptions = exports.deepFilterCom = void 0;
-var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
+var _ahooks = require("ahooks");
 var _lodash = require("lodash");
 var _utils = require("@luck-design-biz/base/utils");
 var _Builder = require("../components/Builder");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["className"];
+var _excluded = ["$css"],
+  _excluded2 = ["className", "$css"];
 var getResources = exports.getResources = function getResources() {
   var _ref = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     _ref$resources = _ref.resources,
@@ -23,12 +25,23 @@ var getResources = exports.getResources = function getResources() {
   return resources;
 };
 var ldComBuilder = exports.ldComBuilder = function ldComBuilder(Com) {
-  var Component = function Component(props) {
-    var _com$props;
+  var Component = /*#__PURE__*/(0, _react.forwardRef)(function (_ref2, ref) {
+    var $css = _ref2.$css,
+      props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
     var resources = getResources();
-    var com = /*#__PURE__*/_react.default.createElement(Com, props);
-    return !(com !== null && com !== void 0 && (_com$props = com.props) !== null && _com$props !== void 0 && _com$props.resource) || (0, _lodash.includes)(resources, com.props.resource) ? com : _react.Fragment;
-  };
+    var hasResources = (0, _ahooks.useCreation)(function () {
+      return (0, _lodash.isNil)(props === null || props === void 0 ? void 0 : props.resource) || (0, _lodash.includes)(resources, props.resource);
+    }, [props === null || props === void 0 ? void 0 : props.resource, resources]);
+    if (hasResources) {
+      return /*#__PURE__*/_react.default.createElement(Com, (0, _extends2.default)({}, props, {
+        ref: ref
+      }));
+    }
+    return props.serialEffect === 'hidden' ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null) : /*#__PURE__*/_react.default.createElement(Com, (0, _extends2.default)({}, props, {
+      disabled: true,
+      ref: ref
+    }));
+  });
   return Component;
 };
 var filterOptions = exports.filterOptions = function filterOptions(options) {
@@ -39,18 +52,20 @@ var filterOptions = exports.filterOptions = function filterOptions(options) {
   });
 };
 var deepFilterCom = exports.deepFilterCom = function deepFilterCom(Com, childMark) {
-  var Component = function Component(_ref2) {
-    var className = _ref2.className,
-      props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
+  var Component = /*#__PURE__*/(0, _react.forwardRef)(function (_ref3, ref) {
+    var className = _ref3.className,
+      $css = _ref3.$css,
+      props = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
     var resources = getResources();
     var com = /*#__PURE__*/_react.default.createElement(Com, (0, _extends2.default)({}, props, {
-      className: (0, _classnames.default)(_index.default.ldLabs, (0, _defineProperty2.default)({}, className, !!className))
+      className: (0, _classnames.default)(_index.default.ldLabs, (0, _defineProperty2.default)({}, className, !!className)),
+      ref: ref
     }));
     return _utils.ChildrenUtil.deepFilter(com, function (child) {
       var _child$props;
       var data = !childMark(child) || !(child !== null && child !== void 0 && (_child$props = child.props) !== null && _child$props !== void 0 && _child$props.resource) || (0, _lodash.includes)(resources, child.props.resource);
       return data;
     });
-  };
+  });
   return Component;
 };

package/lib/index.js

@@ -13,8 +13,15 @@ var _exportNames = {
   buildLdGridForm: true,
   LdInfoPanel: true,
   LdCard: true,
+  LDActions: true,
   LdRuntimeCom: true
 };
+Object.defineProperty(exports, "LDActions", {
+  enumerable: true,
+  get: function get() {
+    return _LDActions.default;
+  }
+});
 Object.defineProperty(exports, "LdCard", {
   enumerable: true,
   get: function get() {
@@ -77,6 +84,7 @@ var _LdAutoForm = _interopRequireDefault(require("./components/LdAutoForm"));
 var _LdGridForm = _interopRequireDefault(require("./components/LdGridForm"));
 var _LdInfoPanel = _interopRequireDefault(require("./components/LdInfoPanel"));
 var _LdCard = _interopRequireDefault(require("./components/LdCard"));
+var _LDActions = _interopRequireDefault(require("./components/LDActions"));
 var _LdRuntimeCom = _interopRequireDefault(require("./components/LdRuntimeCom"));
 var _LdCom = require("./components/LdCom");
 Object.keys(_LdCom).forEach(function (key) {