@luck-design-biz/luckda 1.0.1-11 → 1.0.1-13

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/LdCard/index.js

@@ -1,10 +1,10 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "loading", "wrapperRef", "hasMore", "list", "detail", "params", "doQuery", "onQuery", "unclosableSet", "formatDataSource", "resultSet", "cardConfig", "cardActions", "onOperationsClick", "readOnly", "batchOperations", "readFilter"],
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "loading", "wrapperRef", "hasMore", "list", "detail", "params", "doQuery", "onQuery", "unclosableSet", "formatDataSource", "resultSet", "cardConfig", "maxActionsCount", "cardActions", "onOperationsClick", "readOnly", "batchOperations", "readFilter", "wrapper", "wrapperProps", "draggable", "onDrop", "onMount", "onUnmount"],
   _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery"];
-import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
+import React, { forwardRef, useImperativeHandle, useRef, useEffect, useLayoutEffect } from 'react';
 import { getDvaApp } from 'umi';
 import PropTypes from 'prop-types';
 import { Icon, Tooltip } from 'luck-design/antd';
@@ -16,37 +16,92 @@ import ldBuilder from "../../helper/ldBuilder";
 import { CardList, Card } from '@luck-design-biz/base/List';
 import { formatMessage } from '@luck-design-biz/base/utils';
 import { build } from '@luck-design-biz/base/Component';
-var LdCard = function LdCard(_ref) {
-  var columns = _ref.columns,
-    resources = _ref.resources,
-    actions = _ref.actions,
-    doAction = _ref.doAction,
-    afterInit = _ref.afterInit,
-    namespace = _ref.namespace,
-    loading = _ref.loading,
-    wrapperRef = _ref.wrapperRef,
-    hasMore = _ref.hasMore,
-    list = _ref.list,
-    detail = _ref.detail,
-    params = _ref.params,
-    doQuery = _ref.doQuery,
-    onQuery = _ref.onQuery,
-    unclosableSet = _ref.unclosableSet,
-    formatDataSource = _ref.formatDataSource,
-    resultSet = _ref.resultSet,
-    cardConfig = _ref.cardConfig,
-    cardActions = _ref.cardActions,
+var Action = function Action(_ref) {
+  var data = _ref.data,
+    action = _ref.action,
     onOperationsClick = _ref.onOperationsClick,
-    readOnly = _ref.readOnly,
-    batchOperations = _ref.batchOperations,
-    readFilter = _ref.readFilter,
-    props = _objectWithoutProperties(_ref, _excluded);
+    _ref$inPopover = _ref.inPopover,
+    inPopover = _ref$inPopover === void 0 ? false : _ref$inPopover;
+  var style = _objectSpread({
+    fontSize: '18px'
+  }, action.style);
+  if (action.disabled) style.color = 'var(--luck-color-disabled)';
+  if (inPopover) style = _objectSpread(_objectSpread({}, style), {}, {
+    display: 'flex',
+    cursor: 'pointer'
+  });
+  if (action.render) return /*#__PURE__*/React.createElement("div", {
+    style: style
+  }, action.render());
+  var renderDiv = function renderDiv(_title) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: style,
+      onClick: function onClick(e) {
+        e.stopPropagation();
+        action.onClick ? action.onClick(data, e) : onOperationsClick(action.key, data, e);
+      }
+    }, action.iconNode ? action.iconNode : /*#__PURE__*/React.createElement(Icon, {
+      type: action.icon
+    }), _title && /*#__PURE__*/React.createElement("span", {
+      style: {
+        marginLeft: '4px',
+        fontSize: '12px'
+      }
+    }, _title));
+  };
+  if (inPopover) return renderDiv(action.title);
+  return /*#__PURE__*/React.createElement(Tooltip, {
+    placement: "top",
+    title: action.title
+  }, renderDiv());
+};
+var LdCard = function LdCard(_ref2) {
+  var columns = _ref2.columns,
+    resources = _ref2.resources,
+    actions = _ref2.actions,
+    doAction = _ref2.doAction,
+    afterInit = _ref2.afterInit,
+    namespace = _ref2.namespace,
+    loading = _ref2.loading,
+    wrapperRef = _ref2.wrapperRef,
+    hasMore = _ref2.hasMore,
+    list = _ref2.list,
+    detail = _ref2.detail,
+    params = _ref2.params,
+    doQuery = _ref2.doQuery,
+    onQuery = _ref2.onQuery,
+    unclosableSet = _ref2.unclosableSet,
+    formatDataSource = _ref2.formatDataSource,
+    resultSet = _ref2.resultSet,
+    cardConfig = _ref2.cardConfig,
+    maxActionsCount = _ref2.maxActionsCount,
+    cardActions = _ref2.cardActions,
+    onOperationsClick = _ref2.onOperationsClick,
+    readOnly = _ref2.readOnly,
+    batchOperations = _ref2.batchOperations,
+    readFilter = _ref2.readFilter,
+    wrapper = _ref2.wrapper,
+    wrapperProps = _ref2.wrapperProps,
+    draggable = _ref2.draggable,
+    onDrop = _ref2.onDrop,
+    onMount = _ref2.onMount,
+    onUnmount = _ref2.onUnmount,
+    props = _objectWithoutProperties(_ref2, _excluded);
   var cardRef = useRef(null);
   useEffect(function () {
     readFilter && readFilter(params);
   }, [params]);
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, cardRef.current), {}, {
+      getProps: function getProps() {
+        var _getDvaApp;
+        return {
+          apiUrl: (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || (_getDvaApp = _getDvaApp._store.getState()[namespace]) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.apiUrl,
+          filter: {
+            params: params
+          }
+        };
+      },
       onLdQuery: function onLdQuery() {
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         doQuery({
@@ -56,6 +111,14 @@ var LdCard = function LdCard(_ref) {
       }
     });
   });
+  useLayoutEffect(function () {
+    onMount && onMount({
+      params: params
+    });
+    return function () {
+      onUnmount && onUnmount();
+    };
+  }, []);
   var _batchOperations = useCreation(function () {
     return (batchOperations || []).map(function (i) {
       return _objectSpread(_objectSpread({}, i), {}, {
@@ -66,6 +129,7 @@ var LdCard = function LdCard(_ref) {
   var renderCard = useMemoizedFn(function (item) {
     return /*#__PURE__*/React.createElement(Card, _extends({}, cardConfig, {
       dataSource: item,
+      showDragHandle: draggable,
       operates: readOnly ? [] : item['__infuse_serial__'] || resources,
       onCardClick: function onCardClick(_item, e) {
         return onOperationsClick && onOperationsClick('read', _item, e);
@@ -73,33 +137,46 @@ var LdCard = function LdCard(_ref) {
       onCardDelete: function onCardDelete(_item, e) {
         return onOperationsClick && onOperationsClick('delete', _item, e);
       },
-      actions: PermissionUtil(cardActions.map(function (i) {
-        return i.render ? /*#__PURE__*/React.createElement("div", {
-          key: i.key,
-          wanted: i.resource || 'virtual',
-          style: {
-            fontSize: '18px'
-          }
-        }, i.render()) : /*#__PURE__*/React.createElement(Tooltip, {
-          key: i.key,
-          wanted: i.resource || 'virtual',
-          placement: "top",
-          title: i.title
-        }, /*#__PURE__*/React.createElement("div", {
-          style: {
-            fontSize: '18px'
-          },
-          onClick: function onClick(e) {
-            e.stopPropagation();
-            i.onClick ? i.onClick(item, e) : onOperationsClick(i.key, item, e);
-          }
-        }, /*#__PURE__*/React.createElement(Icon, {
-          type: i.icon
-        })));
-      }), readOnly ? [] : [].concat(_toConsumableArray(item['__infuse_serial__'] || resources), ['virtual']))
+      actions: PermissionUtil(cardActions.map(function (action) {
+        return /*#__PURE__*/React.createElement(Action, {
+          key: action.key,
+          wanted: action.resource || 'virtual',
+          data: item,
+          action: action
+        });
+      }), readOnly ? [] : [].concat(_toConsumableArray(item['__infuse_serial__'] || resources), ['virtual']), false, 'right', maxActionsCount)
     }));
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, difference(Object.keys(params), resultSet.invisibleSet || []).length > 0 && /*#__PURE__*/React.createElement(ResultSet, _extends({
+  var handleDragEnd = useMemoizedFn(function (evt) {
+    var oldIndex = evt.oldIndex,
+      newIndex = evt.newIndex;
+    var PRIMARY = window.appConfig.constraintKeys.PRIMARY;
+    var dragNodeProps = detail[list[oldIndex]];
+    var targetNodeProps = detail[list[newIndex]];
+    if (onDrop) onDrop({
+      dragNodeProps: dragNodeProps,
+      targetNodeProps: targetNodeProps,
+      evt: evt
+    });else {
+      doAction('drag', {
+        get: {
+          datasetCode: props.dataSetKey
+        },
+        post: {
+          fromId: dragNodeProps[PRIMARY],
+          toId: targetNodeProps[PRIMARY]
+        }
+      }, {
+        showConfirm: false,
+        callback: function callback(success) {
+          return success && doQuery();
+        }
+      });
+    }
+  });
+  return /*#__PURE__*/React.createElement("div", _extends({
+    ref: wrapper
+  }, wrapperProps), difference(Object.keys(params), resultSet.invisibleSet || []).length > 0 && /*#__PURE__*/React.createElement(ResultSet, _extends({
     set: params,
     onQuery: onQuery
   }, resultSet, {
@@ -107,14 +184,16 @@ var LdCard = function LdCard(_ref) {
   })), /*#__PURE__*/React.createElement(CardList, _extends({
     col: 4,
     loading: loading,
-    renderCard: renderCard
+    renderCard: renderCard,
+    onDragEnd: handleDragEnd
   }, props, {
     operates: [].concat(_toConsumableArray(resources), ['virtual']),
     modelName: namespace,
     dataSource: formatDataSource(list, detail),
     hasMore: !!hasMore,
     batchOperations: _batchOperations,
-    ref: cardRef
+    ref: cardRef,
+    draggable: draggable
   })));
 };
 var ForwardLdCard = /*#__PURE__*/forwardRef(function (props, ref) {
@@ -122,23 +201,23 @@ var ForwardLdCard = /*#__PURE__*/forwardRef(function (props, ref) {
     wrapperRef: ref
   }, props));
 });
-var LdIndex = function LdIndex(_ref2) {
-  var namespace = _ref2.ldId,
-    moduleCode = _ref2.moduleCode,
-    suppressInit = _ref2.suppressInit,
-    overModel = _ref2.overModel,
-    afterQuery = _ref2.afterQuery,
-    props = _objectWithoutProperties(_ref2, _excluded2);
+var LdIndex = function LdIndex(_ref3) {
+  var namespace = _ref3.ldId,
+    moduleCode = _ref3.moduleCode,
+    suppressInit = _ref3.suppressInit,
+    overModel = _ref3.overModel,
+    afterQuery = _ref3.afterQuery,
+    props = _objectWithoutProperties(_ref3, _excluded2);
   if (includes(props.isTree, props.dataSetKey)) return formatMessage({
     id: 'luckda.ldCard.notTres',
     label: '此数据集为树形数据集，请选择非树形数据集'
   });
   var Component = useCreation(function () {
-    var _getDvaApp, _getDvaApp2;
-    (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 || _getDvaApp.unmodel(namespace);
-    if (!((_getDvaApp2 = getDvaApp()) !== null && _getDvaApp2 !== void 0 && _getDvaApp2._store.getState()[namespace])) {
-      var _getDvaApp3;
-      (_getDvaApp3 = getDvaApp()) === null || _getDvaApp3 === void 0 || _getDvaApp3.model(createModel(namespace, _objectSpread(_objectSpread({
+    var _getDvaApp2, _getDvaApp3;
+    (_getDvaApp2 = getDvaApp()) === null || _getDvaApp2 === void 0 || _getDvaApp2.unmodel(namespace);
+    if (!((_getDvaApp3 = getDvaApp()) !== null && _getDvaApp3 !== void 0 && _getDvaApp3._store.getState()[namespace])) {
+      var _getDvaApp4;
+      (_getDvaApp4 = getDvaApp()) === null || _getDvaApp4 === void 0 || _getDvaApp4.model(createModel(namespace, _objectSpread(_objectSpread({
         isFlow: !!props.isFlow
       }, overModel), {}, {
         dataSetKey: props.dataSetKey,
@@ -190,7 +269,8 @@ Index.defaultProps = {
   },
   cardActions: [],
   overModel: {},
-  cardKey: window.appConfig.constraintKeys.PRIMARY
+  cardKey: window.appConfig.constraintKeys.PRIMARY,
+  maxActionsCount: 3
 };
 export default /*#__PURE__*/forwardRef(function (props, ref) {
   return /*#__PURE__*/React.createElement(Index, _extends({

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.less

@@ -1,41 +1,43 @@
-.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-);
-  }
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
+.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: @text-color-secondary_luck;
+    }
+
+    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: @text-color;
+  }
 }