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

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

@@ -1,20 +1,91 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["id"];
+var _excluded = ["context", "id", "className", "dataset", "width", "height", "showLine", "defaultExpandDeep", "editable"];
 import React, { useRef } from 'react';
+import PropTypes from 'prop-types';
 import { useMemoizedFn } from 'ahooks';
+import classNames from 'classnames';
 import Wrapper from "../Wrapper";
+import { LdTree } from "../../../../index";
+import { RUNTIME } from "../../../constants";
+import { omitBadProps } from "../../../engine/tools/helper";
+import defaultMeta from "../../../engine/meta/tree.props.default.json";
+import styles from "./index.less";
 var LCTree = function LCTree(_ref) {
-  var id = _ref.id,
+  var context = _ref.context,
+    id = _ref.id,
+    className = _ref.className,
+    dataset = _ref.dataset,
+    width = _ref.width,
+    height = _ref.height,
+    showLine = _ref.showLine,
+    defaultExpandDeep = _ref.defaultExpandDeep,
+    editable = _ref.editable,
     props = _objectWithoutProperties(_ref, _excluded);
+  var boxRef = useRef();
   var ref = useRef();
   var getTargetDom = useMemoizedFn(function () {
-    return ref.current;
+    return boxRef.current;
   });
   return /*#__PURE__*/React.createElement(Wrapper, {
     id: id,
     getTargetDom: getTargetDom
-  }, /*#__PURE__*/React.createElement("div", {
-    ref: ref
-  }, "LCTree"));
+  }, /*#__PURE__*/React.createElement(LdTree, _extends({
+    ref: ref,
+    boxRef: boxRef,
+    width: width,
+    height: height,
+    id: id,
+    ldId: id,
+    className: classNames(_defineProperty(_defineProperty({}, styles['runtime-tree'], context.runtime === RUNTIME.DESIGN), className, !!className)),
+    dataSetKey: dataset,
+    showLine: showLine,
+    readOnly: !editable,
+    defaultExpandDeep: defaultExpandDeep === 'all' ? defaultExpandDeep : Number(defaultExpandDeep) // 可以为数字或者“all”
+  }, props)));
+};
+LCTree.propTypes = {
+  /**
+   * @name 唯一标识
+   * @type string
+   * @disabled true
+   */
+  id: PropTypes.string.isRequired,
+  /**
+   * @name 数据集
+   * @type _DataSetSelector
+   */
+  dataset: PropTypes.string,
+  /**
+   * @name 支持编辑
+   * @type switch
+   * @default true
+   */
+  editable: PropTypes.bool,
+  /**
+   * @name 宽度
+   * @type _WidthHeight
+   * @default 100%
+   * @group styleSetting
+   */
+  width: PropTypes.string,
+  /**
+   * @name 高度
+   * @type _WidthHeight
+   * @default 100%
+   * @group styleSetting
+   */
+  height: PropTypes.string,
+  /**
+   * @name 操作项
+   * @type _TableActions
+   * @groupNext actionsColumn
+   * @default { "todoList": []}
+   */
+  actions: PropTypes.shape({
+    todoList: PropTypes.array
+  })
 };
+LCTree.defaultProps = omitBadProps(defaultMeta);
 export default LCTree;

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

@@ -0,0 +1,2 @@
+.runtime-tree{
+}

package/es/lowcode/view/lc-components/Tree/meta.json

@@ -14,100 +14,142 @@
       "disabled": true
     },
     {
-      "key": "dateset",
+      "key": "dataset",
       "name": "数据集",
       "desc": "选择系统中的可用树形数据集",
       "type": "_DataSetSelector"
     },
     {
-      "key": "showLine",
-      "name": "显示线",
-      "desc": "是否显示树组件的连接线",
-      "type": "boolean",
-      "default": false
+      "key": "title",
+      "name": "标题",
+      "desc": "头部标题",
+      "type": "string"
+    },
+    {
+      "key": "styleSetting",
+      "name": "风格和样式",
+      "type": "group",
+      "props": [
+        {
+          "key": "width",
+          "name": "宽度",
+          "type": "_WidthHeight",
+          "default": "100%"
+        },
+        {
+          "key": "height",
+          "name": "高度",
+          "type": "_WidthHeight",
+          "default": "100%"
+        },
+        {
+          "key": "showLine",
+          "name": "显示线",
+          "desc": "是否显示树组件的连接线",
+          "type": "switch",
+          "default": false
+        },
+        {
+          "key": "showIcon",
+          "name": "显示图标",
+          "desc": "是否显示树组件的图标",
+          "type": "switch",
+          "default": true
+        },
+        {
+          "key": "defaultExpandDeep",
+          "name": "默认展开层级",
+          "desc": "默认展开多少层级",
+          "type": "select",
+          "options": [
+            {
+              "label": "不展开",
+              "value": "0"
+            },
+            {
+              "label": "1",
+              "value": "1"
+            },
+            {
+              "label": "2",
+              "value": "2"
+            },
+            {
+              "label": "3",
+              "value": "3"
+            },
+            {
+              "label": "4",
+              "value": "4"
+            },
+            {
+              "label": "全部",
+              "value": "all"
+            }
+          ],
+          "default": "0"
+        }
+      ]
     },
     {
       "key": "lazyLoad",
       "name": "懒加载",
       "desc": "是否树形组件懒加载",
-      "type": "boolean",
+      "type": "switch",
       "default": false
     },
     {
       "key": "editable",
       "name": "支持编辑",
       "desc": "是否支持编辑树",
-      "type": "boolean",
-      "default": false
+      "type": "switch",
+      "default": true
     },
     {
       "key": "draggable",
       "name": "支持拖拽",
       "desc": "是否支持拖拽",
-      "type": "boolean",
-      "default": false
-    },
-    {
-      "key": "defaultExpandDeep",
-      "name": "默认展开层级",
-      "desc": "默认展开多少层级",
-      "type": "select",
-      "options": [
-        {
-          "label": "1",
-          "value": "1"
-        },
-        {
-          "label": "2",
-          "value": "2"
-        },
-        {
-          "label": "3",
-          "value": "3"
-        },
-        {
-          "label": "4",
-          "value": "4"
-        },
-        {
-          "label": "5",
-          "value": "5"
-        },
-        {
-          "label": "全部",
-          "value": "all"
-        }
-      ],
-      "default": 1
-    },
-    {
-      "key": "rowKey",
-      "name": "数据主键key",
-      "desc": "数据主键",
-      "type": "string"
+      "type": "switch",
+      "default": true
     },
     {
       "key": "actions",
       "name": "操作项",
       "desc": "单行操作项",
-      "type": "_ActionSelector"
+      "type": "group",
+      "default": true,
+      "next": {
+        "name": "操作列",
+        "props": [
+          {
+            "key": "actions",
+            "name": "表格操作项",
+            "type": "_ActionsEditor",
+            "default": { "todoList": [] },
+            "suppressDisplay": true,
+            "suppressMax": true,
+            "suppressMore": true,
+            "wrapper": "collapse",
+            "wrapperProps": { "suppressIcon": true }
+          }
+        ]
+      }
     },
     {
       "key": "doubleClick",
       "name": "开启双击事件",
       "desc": "是否开启双击事件（默认双击收缩节点）",
-      "type": "boolean",
+      "type": "switch",
       "default": true
     },
     {
       "key": "multiple",
       "name": "多选",
       "desc": "是否支持多选",
-      "type": "boolean",
+      "type": "switch",
       "default": false
     }
   ],
-  "style": {},
   "advance": {
     "events": [
       {
@@ -150,7 +192,7 @@
         "key": "onDoubleClick",
         "name": "自定义双击事件",
         "desc": "自定义双击事件，默认为收缩节点",
-        "func": "(rowData)=>{\n\t\n}"
+        "func": "(e, rowData, doubleClickFunc)=>{\n\t\n}"
       }
     ]
   }

package/es/lowcode/view/lc-components/Wrapper.js

@@ -28,7 +28,7 @@ var LCWrapper = function LCWrapper(_ref) {
         dom.setAttribute('id', id);
         dom.classList.add(CELL_CLASS_NAME);
       }
-      context.register(id, new Proxy({
+      context._register(id, new Proxy({
         dom: dom
       }, {
         get: function get(target, property, receiver) {
@@ -43,7 +43,7 @@ var LCWrapper = function LCWrapper(_ref) {
       });
     });
     return function () {
-      context.unregister(id);
+      context._unregister(id);
       context.$publisher(context.topics.COMPONENT_UNMOUNT, {
         id: id
       });

package/lib/components/LDActions/index.js

@@ -0,0 +1,138 @@
+"use strict";
+
+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 _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _react = _interopRequireWildcard(require("react"));
+var _ahooks = require("ahooks");
+var _base = require("@luck-design-biz/base");
+var _antd = require("luck-design/antd");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _lodash = require("lodash");
+var _ldComBuild = require("../../helper/ldComBuild");
+var _index = _interopRequireDefault(require("./index.less"));
+var _excluded = ["children", "display", "action", "className", "onClick"],
+  _excluded2 = ["max", "display", "todoList", "className", "moreText", "doAction"];
+var DisplayComp = function DisplayComp(_ref) {
+  var children = _ref.children,
+    display = _ref.display,
+    action = _ref.action,
+    className = _ref.className,
+    onClick = _ref.onClick,
+    props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
+  if (display === 'text') {
+    return /*#__PURE__*/_react.default.createElement("span", (0, _extends2.default)({}, props, {
+      className: (0, _classnames.default)(_index.default[action.riskLevel], (0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, !!className), _index.default.disabled, action.serialEffect === 'disable')),
+      onClick: onClick
+    }), children);
+  }
+  return /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _extends2.default)({}, props, {
+    disabled: action.serialEffect === 'disable',
+    className: (0, _classnames.default)(_index.default[action.riskLevel], (0, _defineProperty2.default)({}, className, !!className)),
+    onClick: onClick
+  }), children);
+};
+var LDActions = function LDActions(_ref2) {
+  var max = _ref2.max,
+    display = _ref2.display,
+    todoList = _ref2.todoList,
+    className = _ref2.className,
+    _ref2$moreText = _ref2.moreText,
+    moreText = _ref2$moreText === void 0 ? '更多行为' : _ref2$moreText,
+    doAction = _ref2.doAction,
+    props = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
+  var resources = (0, _ldComBuild.getResources)();
+  var handleClick = (0, _ahooks.useMemoizedFn)(function (action) {
+    if (action.riskLevel === 'danger') {
+      _base.Modal.confirm({
+        title: "\u786E\u8BA4\u6267\u884C".concat(action.name, "\u884C\u4E3A\u64CD\u4F5C\u5417\uFF1F"),
+        onOk: function onOk() {
+          return doAction(action);
+        }
+      });
+    } else if (action.riskLevel === 'destroy') {
+      (0, _base.recheck)({
+        title: "\u786E\u8BA4\u6267\u884C".concat(action.name, "\u884C\u4E3A\u64CD\u4F5C\u5417\uFF1F"),
+        checkWords: "\u6267\u884C".concat(action.name),
+        onOk: function onOk() {
+          return doAction(action);
+        }
+      });
+    } else {
+      doAction(action);
+    }
+  });
+  var actionMap = (0, _ahooks.useCreation)(function () {
+    return (0, _lodash.reduce)(todoList, function (ret, action, index) {
+      ret[action.serial] = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, action), {}, {
+        serialValue: Math.pow(2, index)
+      });
+      return ret;
+    }, {});
+  }, [todoList]);
+  var mySerialsValue = (0, _ahooks.useCreation)(function () {
+    return (0, _lodash.reduce)(resources, function (ret, resKey) {
+      var _actionMap$resKey;
+      ret |= ((_actionMap$resKey = actionMap[resKey]) === null || _actionMap$resKey === void 0 ? void 0 : _actionMap$resKey.serialValue) || 0;
+      return ret;
+    }, 0);
+  }, [resources, actionMap]);
+  var _useCreation = (0, _ahooks.useCreation)(function () {
+      var approvedActions = (0, _lodash.reduce)(actionMap, function (ret, action) {
+        if (mySerialsValue & action.serialValue) {
+          ret.push(action);
+        } else if (action.serialEffect === 'disable') {
+          ret.push(action);
+        }
+        return ret;
+      }, []);
+      var _length = approvedActions.length;
+      var _permanent = approvedActions.splice(0, max >= _length ? _length : max - 1);
+      return [_permanent, approvedActions];
+    }, [max, mySerialsValue, actionMap]),
+    _useCreation2 = (0, _slicedToArray2.default)(_useCreation, 2),
+    permanent = _useCreation2[0],
+    more = _useCreation2[1];
+  return /*#__PURE__*/_react.default.createElement("div", (0, _extends2.default)({
+    className: (0, _classnames.default)(_index.default.ldActions, (0, _defineProperty2.default)({}, className, !!className))
+  }, props), permanent.map(function (action, index) {
+    return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
+      key: action.id
+    }, /*#__PURE__*/_react.default.createElement(DisplayComp, {
+      display: display,
+      action: action,
+      onClick: function onClick() {
+        return handleClick(action);
+      }
+    }, action.name), display === 'text' && index < permanent.length - (more.length ? 0 : 1) && /*#__PURE__*/_react.default.createElement(_antd.Divider, {
+      type: "vertical"
+    }));
+  }), !!more.length && /*#__PURE__*/_react.default.createElement(_antd.Dropdown, {
+    overlay: /*#__PURE__*/_react.default.createElement(_antd.Menu, {
+      onClick: function onClick(e) {
+        return handleClick(e.item.props.action);
+      }
+    }, more.map(function (action) {
+      return /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
+        key: action.id,
+        action: action
+      }, action.name);
+    }))
+  }, /*#__PURE__*/_react.default.createElement(DisplayComp, {
+    display: display,
+    action: {
+      riskLevel: 'default'
+    }
+  }, moreText, display !== 'text' && /*#__PURE__*/_react.default.createElement(_antd.Icon, {
+    type: "down"
+  }))));
+};
+var _default = exports.default = LDActions;

package/lib/components/LDActions/index.less

@@ -0,0 +1,48 @@
+.ldActions {
+
+  button:not(:last-child) {
+    margin-right: 8px;
+  }
+  span {
+    cursor: pointer;
+  }
+
+  button.default {
+    background-color: white;
+  }
+  span.default {
+    color: #262626;
+  }
+
+  button.primary {
+    background-color: var(--luck-color-primary);
+    border-color: var(--luck-color-primary);
+    color: white;
+  }
+  span.primary {
+    color: var(--luck-color-primary);
+  }
+
+  button.danger {
+    background-color: #ff4d4f;
+    border-color: #ff4d4f;
+    color: white;
+  }
+  span.danger {
+    color: #ff4d4f;
+  }
+
+  button.destroy {
+    background-color: #820014;
+    border-color: #820014;
+    color: white;
+  }
+  span.destroy {
+    color: #820014;
+  }
+
+  span.disabled {
+    color: #bfbfbf;
+    cursor: not-allowed;
+  }
+}

package/lib/components/LdFormList/index.js

@@ -203,8 +203,8 @@ var LdFormList = function LdFormList(_ref) {
       mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
       setSubmitLoading(false);
-      var mainFormData = res.detail[res.list[0]];
       if (success) {
+        var mainFormData = res.detail[res.list[0]];
         if (afterSubmit) {
           afterSubmit(success, mainKey, res);
         } else {

package/lib/components/LdGrid/index.js

@@ -96,9 +96,15 @@ var LdGrid = function LdGrid(_ref) {
    * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = (0, _ahooks.useCreation)(function () {
-    if (columnsReset) return columnsReset;
+    if (columnsReset) {
+      if (_lodash.isFunction) {
+        return columnsReset(columns);
+      }
+      return columnsReset;
+    }
+    var _columnsRewrite = (0, _lodash.isFunction)(columnsRewrite) ? columnsRewrite(columns) : columnsRewrite;
     var defaultColumns = (0, _lodash.keyBy)(columns, 'aliaName');
-    var customColumns = (0, _lodash.keyBy)(columnsRewrite, 'field');
+    var customColumns = (0, _lodash.keyBy)(_columnsRewrite, 'field');
     var mergeFields = (0, _lodash.union)((0, _lodash.keys)(defaultColumns), (0, _lodash.keys)(customColumns));
     return (0, _lodash.transform)(mergeFields, function (result, field) {
       var _customColumns$field;

package/lib/components/LdTree/index.js

@@ -23,7 +23,7 @@ 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", "doubleClick", "onNodeDoubleClick", "width", "height"],
   _excluded2 = ["onClick"];
 var LdTree = function LdTree(_ref) {
   var columns = _ref.columns,
@@ -53,6 +53,11 @@ var LdTree = function LdTree(_ref) {
     isTree = _ref.isTree,
     service = _ref.service,
     dataToTreeFormat = _ref.dataToTreeFormat,
+    boxRef = _ref.boxRef,
+    doubleClick = _ref.doubleClick,
+    onNodeDoubleClick = _ref.onNodeDoubleClick,
+    width = _ref.width,
+    height = _ref.height,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   if (!(0, _lodash.includes)(isTree, dataSetKey)) return (0, _utils.formatMessage)({
     id: 'luckda.ldTree.notTres',
@@ -115,6 +120,11 @@ var LdTree = function LdTree(_ref) {
       }
     });
   });
+  (0, _react.useLayoutEffect)(function () {
+    run((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params[0]), defaultParams[0]), {}, {
+      datasetCode: dataSetKey
+    }));
+  }, [dataSetKey]);
   var handleMenuClick = function handleMenuClick(menu, data) {
     var onClick = menu.onClick,
       other = (0, _objectWithoutProperties2.default)(menu, _excluded2);
@@ -147,15 +157,27 @@ 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 (onNodeDoubleClick) onNodeDoubleClick(e, rowData, function () {
+      return handleNodeDoubleClick(e);
+    });else handleNodeDoubleClick(e);
+  });
   var renderTitleNode = function renderTitleNode(data, unSelectable) {
     var nodeTitle = (0, _lodash.isFunction)(treeNodeTitle) ? treeNodeTitle(data) : data[treeNodeTitle];
     return /*#__PURE__*/_react.default.createElement("div", {
       className: _index.default.nodeTitle,
-      key: data[rowKey]
+      key: data[rowKey],
+      onDoubleClick: function onDoubleClick(e) {
+        return doubleClick && handleDoubleClick(e, data);
+      }
     }, /*#__PURE__*/_react.default.createElement("div", {
       title: nodeTitle,
       className: (0, _classnames.default)((0, _defineProperty2.default)({}, _index.default.nodeTitleDisabled, unSelectable))
-    }, nodeTitle), !readOnly && renderRight(data));
+    }, nodeTitle, "11"), !readOnly && renderRight(data));
   };
   var renderTreeNodes = (0, _ahooks.useMemoizedFn)(function (data) {
     return data.map(function (item) {
@@ -193,7 +215,12 @@ var LdTree = function LdTree(_ref) {
     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)),

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/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) {