@luck-design-biz/luckda 0.0.25-21 → 0.0.25-22

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2020 UmiJS
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2020 UmiJS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,40 +1,40 @@
-# 微服务 3.0 纯净版
-
-luck-react-pure 是一个基于 qiankun 框架搭建的极简微服务框架，作为微服务业务子系统的开发基座。旨在为业务子系统提供简单、轻量的解决方案。该框架去除了冗余的功能，专注于提供基本的功能支持，使开发者能够更快速地搭建和开发业务子系统。
-
-## 启动
-
-安装 `node_modules`:
-
-```bash
-pnpm install
-```
-
-## 开始项目
-
-```bash
-pnpm start
-```
-
-## 代码校验
-
-本框架提供了代码校验方案，校验不通过禁止提交代码，当提交代码时将会校验以下内容：
-
-### 代码规范
-
-根据 eslint 校验规范。
-
-### commit message 校验
-
-commit message 格式：
-
-```bash
-💥 feat(模块): 添加了个很棒的功能
-🐛 fix(模块): 修复了一些 bug
-📝 docs(模块): 更新了一下文档
-💄 UI(模块): 修改了一下样式
-🎨 chore(模块): 对脚手架做了些更改
-🚨 refactor(模块): 重构（即不是新增功能，也不是修改bug的代码变动）
-🐞 test(模块): 增加、修改测试用例
-🌟 release(3.0.1):url
-```
+# 微服务 3.0 纯净版
+
+luck-react-pure 是一个基于 qiankun 框架搭建的极简微服务框架，作为微服务业务子系统的开发基座。旨在为业务子系统提供简单、轻量的解决方案。该框架去除了冗余的功能，专注于提供基本的功能支持，使开发者能够更快速地搭建和开发业务子系统。
+
+## 启动
+
+安装 `node_modules`:
+
+```bash
+pnpm install
+```
+
+## 开始项目
+
+```bash
+pnpm start
+```
+
+## 代码校验
+
+本框架提供了代码校验方案，校验不通过禁止提交代码，当提交代码时将会校验以下内容：
+
+### 代码规范
+
+根据 eslint 校验规范。
+
+### commit message 校验
+
+commit message 格式：
+
+```bash
+💥 feat(模块): 添加了个很棒的功能
+🐛 fix(模块): 修复了一些 bug
+📝 docs(模块): 更新了一下文档
+💄 UI(模块): 修改了一下样式
+🎨 chore(模块): 对脚手架做了些更改
+🚨 refactor(模块): 重构（即不是新增功能，也不是修改bug的代码变动）
+🐞 test(模块): 增加、修改测试用例
+🌟 release(3.0.1):url
+```

package/es/components/LDActions/index.less

@@ -1,68 +1,68 @@
-@spanDefault: #262626;
-@spanPrimary: var(--ant-primary-color);
-@spanDanger: #ff4d4f;
-@spanDestroy: #820014;
-
-.ldActions {
-
-  button:not(:last-child) {
-    margin-right: 4px;
-  }
-  button:not(:first-child) {
-    margin-left: 4px;
-  }
-  span {
-    cursor: pointer;
-  }
-
-  button.default {
-    background-color: white;
-  }
-  span.default {
-    color: @spanDefault;
-  }
-
-  button.primary {
-    background-color: var(--ant-primary-color);
-    border-color: var(--ant-primary-color);
-    color: white;
-  }
-  span.primary {
-    color: @spanPrimary;
-  }
-
-  button.danger {
-    background-color: #ff4d4f;
-    border-color: #ff4d4f;
-    color: white;
-  }
-  span.danger {
-    color: @spanDanger;
-  }
-
-  button.destroy {
-    background-color: #820014;
-    border-color: #820014;
-    color: white;
-  }
-  span.destroy {
-    color: @spanDestroy;
-  }
-
-  span.disabled {
-    color: #bfbfbf;
-    cursor: not-allowed;
-  }
-}
-span.default.menuItem {
-  color: @spanDefault;
-}
-span.primary.menuItem {
-  color: @spanPrimary;
-}
-span.danger.menuItem {
-  color: @spanDanger;
-}
-span.destroy.menuItem {
-  color: @spanDestroy;
-}
+@spanDefault: #262626;
+@spanPrimary: var(--ant-primary-color);
+@spanDanger: #ff4d4f;
+@spanDestroy: #820014;
+
+.ldActions {
+
+  button:not(:last-child) {
+    margin-right: 4px;
+  }
+  button:not(:first-child) {
+    margin-left: 4px;
+  }
+  span {
+    cursor: pointer;
+  }
+
+  button.default {
+    background-color: white;
+  }
+  span.default {
+    color: @spanDefault;
+  }
+
+  button.primary {
+    background-color: var(--ant-primary-color);
+    border-color: var(--ant-primary-color);
+    color: white;
+  }
+  span.primary {
+    color: @spanPrimary;
+  }
+
+  button.danger {
+    background-color: #ff4d4f;
+    border-color: #ff4d4f;
+    color: white;
+  }
+  span.danger {
+    color: @spanDanger;
+  }
+
+  button.destroy {
+    background-color: #820014;
+    border-color: #820014;
+    color: white;
+  }
+  span.destroy {
+    color: @spanDestroy;
+  }
+
+  span.disabled {
+    color: #bfbfbf;
+    cursor: not-allowed;
+  }
+}
+span.default.menuItem {
+  color: @spanDefault;
+}
+span.primary.menuItem {
+  color: @spanPrimary;
+}
+span.danger.menuItem {
+  color: @spanDanger;
+}
+span.destroy.menuItem {
+  color: @spanDestroy;
+}

package/es/components/LdGrid/index.js

@@ -93,10 +93,10 @@ var LdGrid = function LdGrid(_ref) {
     });
   }, [batchOperations]);
 
-  /**
-   * 优先级
-   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
-   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
+  /**
+   * 优先级
+   * columnsReset 重置columns，不受模块管理限制，写什么展示什么
+   * columnsRewrite 覆盖模块管理配置，是否展示以模块管理配置为主，自己可以用hide来隐藏某字段
    */
   var _columns = useCreation(function () {
     if (columnsReset) {

package/es/components/LdGridForm/index.less

@@ -1,7 +1,7 @@
-.ldGridForm {
-  :global {
-    .ag-layout-auto-height {
-      height: 100% !important;
-    }
-  }
-}
+.ldGridForm {
+  :global {
+    .ag-layout-auto-height {
+      height: 100% !important;
+    }
+  }
+}

package/es/components/LdTree/index.js

@@ -7,18 +7,29 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 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", "onlyRoot"],
   _excluded2 = ["onClick"];
 import React, { useState, useRef, useImperativeHandle, forwardRef, useLayoutEffect } from 'react';
-import { isFunction, isNumber, transform, includes, remove, cloneDeep, isNil, differenceBy } from 'lodash';
+import { isFunction, isNumber, transform, includes, remove, cloneDeep, isNil, differenceBy, groupBy, forEach, assign } from 'lodash';
 import { useRequest, useMemoizedFn, useCreation } from 'ahooks';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
 import { Icon, Popover } from 'luck-design/antd';
 import { LuckTree } from 'luck-design';
-import { formatMessage, dataToTree, dragTreeData, flattenTree } from '@luck-design-biz/base/utils';
+import { formatMessage, dataToTree, dragTreeData } from '@luck-design-biz/base/utils';
 import { TreeBox } from '@luck-design-biz/base';
 import ldBuilder from "../../helper/ldBuilder";
 import { behaviorCall } from "../../utils";
 import styles from "./index.less";
-var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
+var _window$appConfig$con = window.appConfig.constraintKeys,
+  PRIMARY = _window$appConfig$con.PRIMARY,
+  PARENT = _window$appConfig$con.PARENT;
+var deepForEach = function deepForEach(children, deepForEachFn) {
+  forEach(children, function (child) {
+    var _child$children;
+    if (((_child$children = child.children) === null || _child$children === void 0 ? void 0 : _child$children.length) > 0) {
+      deepForEach(child.children, deepForEachFn);
+    }
+    deepForEachFn(child);
+  });
+};
 var LdTree = function LdTree(_ref) {
   var columns = _ref.columns,
     resources = _ref.resources,
@@ -128,26 +139,37 @@ var LdTree = function LdTree(_ref) {
     run(_objectSpread(_objectSpread(_objectSpread({}, params[0]), _params), defaultParams[0]));
   });
   var handleUpdateTree = function handleUpdateTree(type, nodes) {
-    var data = [];
-    var flattenData = flattenTree(dataSource);
+    var data = cloneDeep(dataSource);
+    var nodesGroup = groupBy(nodes, PARENT);
     switch (type) {
       case 'delete':
-        data = differenceBy(flattenData, nodes, window.appConfig.constraintKeys.PRIMARY);
+        deepForEach(data, function (child) {
+          if (nodesGroup[child[PRIMARY]]) {
+            var _child$children2;
+            if (((_child$children2 = child.children) === null || _child$children2 === void 0 ? void 0 : _child$children2.length) <= nodesGroup[child[PRIMARY]].length) child.isleaf = true;
+            child.children = differenceBy(child.children, nodesGroup[child[PRIMARY]], window.appConfig.constraintKeys.PRIMARY);
+          }
+        });
         break;
       case 'add':
-        data = [].concat(_toConsumableArray(flattenData), _toConsumableArray(nodes));
+        deepForEach(data, function (child) {
+          if (nodesGroup[child[PRIMARY]]) {
+            child.isleaf = false;
+            child.children = [].concat(_toConsumableArray(child.children || []), _toConsumableArray(nodesGroup[child[PRIMARY]]));
+          }
+        });
         break;
       default:
-        data = flattenData.map(function (i) {
+        deepForEach(data, function (child) {
           var findNode = nodes.find(function (n) {
-            return n[PRIMARY] === i[PRIMARY];
+            return n[PRIMARY] === child[PRIMARY];
           });
-          if (findNode) return _objectSpread(_objectSpread({}, i), findNode);
-          return i;
+          if (findNode) {
+            assign(child, findNode);
+          }
         });
     }
-    var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null, window.appConfig.constraintKeys.PRIMARY, window.appConfig.constraintKeys.PARENT);
-    setDataSource(treeData);
+    setDataSource(data);
   };
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, treeRef.current), {}, {
@@ -233,7 +255,7 @@ var LdTree = function LdTree(_ref) {
         disabled: treeNodeDisable && treeNodeDisable(item)
       };
       if (treeNodeIcon && !isNil(treeNodeIcon(item))) props.icon = treeNodeIcon(item);
-      if (!item.isleaf) {
+      if (!item.isleaf && !isNil(item.isleaf)) {
         return /*#__PURE__*/React.createElement(LuckTree.TreeNode, _extends({
           isLeaf: false
         }, props), renderTreeNodes(item.children || []));

package/es/components/LdTree/index.less

@@ -1,41 +1,41 @@
-.tree {
-  .nodeTitle {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    user-select: none;
-
-    div {
-      flex: 1;
-      overflow-x: hidden;
-      white-space: nowrap;
-      text-overflow: ellipsis;
-    }
-
-    div.nodeTitleDisabled {
-      color: var(--luck-text-color-disabled);
-    }
-
-    div.nodeTitleDisabled:hover {
-      cursor: not-allowed;
-    }
-  }
-
-  :global {
-    .ant-tree-title {
-      width: 100%;
-    }
-  }
-}
-
-.classTreeOperates {
-  :global(.ant-popover-inner-content) {
-    padding: 0;
-  }
-
-  .rightMenu {
-    display: block;
-    padding: 4px 8px;
-    color: var(--luck-text-color-);
-  }
+.tree {
+  .nodeTitle {
+    display: flex;
+    align-items: center;
+    width: 100%;
+    user-select: none;
+
+    div {
+      flex: 1;
+      overflow-x: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+    }
+
+    div.nodeTitleDisabled {
+      color: var(--luck-text-color-disabled);
+    }
+
+    div.nodeTitleDisabled:hover {
+      cursor: not-allowed;
+    }
+  }
+
+  :global {
+    .ant-tree-title {
+      width: 100%;
+    }
+  }
+}
+
+.classTreeOperates {
+  :global(.ant-popover-inner-content) {
+    padding: 0;
+  }
+
+  .rightMenu {
+    display: block;
+    padding: 4px 8px;
+    color: var(--luck-text-color-);
+  }
 }

package/es/helper/action.js

@@ -7,12 +7,12 @@ import { transform, isArray, startsWith, keyBy } from 'lodash';
 import { dataFormat, behaviorCall } from "../utils";
 import { defaultComName } from "./form";
 
-/**
- * 提交行为
- * @param action 行为
- * @param data 数据
- * @param parmas 附件设置
- * @param moduleData 当前模块信息
+/**
+ * 提交行为
+ * @param action 行为
+ * @param data 数据
+ * @param parmas 附件设置
+ * @param moduleData 当前模块信息
  */
 export var doAction = function doAction(action) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

package/es/helper/form.js

@@ -29,11 +29,11 @@ export var defaultComName = {
   complex: 'complex'
 };
 
-/**
- * 动态表单配置项转译
- * @param {key string} keyStr
- * @param {label string} labelStr
- * @returns [{key,label}]
+/**
+ * 动态表单配置项转译
+ * @param {key string} keyStr
+ * @param {label string} labelStr
+ * @returns [{key,label}]
  */
 export var splitStrToObj = function splitStrToObj(keyStr, labelStr) {
   var keys = keyStr && keyStr.length > 0 ? keyStr.split(',') : undefined;
@@ -50,11 +50,11 @@ export var splitStrToObj = function splitStrToObj(keyStr, labelStr) {
   return undefined;
 };
 
-/**
- * 动态表单配置项转译
- * @param {动态表单配置项} props
- * @param {自定义动态表单配置项} customProps
- * @returns {name: '',...}
+/**
+ * 动态表单配置项转译
+ * @param {动态表单配置项} props
+ * @param {自定义动态表单配置项} customProps
+ * @returns {name: '',...}
  */
 export function translator() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -121,10 +121,10 @@ export function translator() {
   return _props;
 }
 
-/**
- * 删除自动移操作中的不可覆盖字段
- * @param props
- * @returns {{multiple}|*}
+/**
+ * 删除自动移操作中的不可覆盖字段
+ * @param props
+ * @returns {{multiple}|*}
  */
 export function formatCustomProps(comType, props) {
   var _props2, _props3;

package/es/helper/index.less

@@ -1,7 +1,7 @@
-.ldLabs{
-  :global{
-    .ant-tabs-bar{
-      margin: 0 0 4px 0;
-    }
-  }
-}
+.ldLabs{
+  :global{
+    .ant-tabs-bar{
+      margin: 0 0 4px 0;
+    }
+  }
+}