@luck-design-biz/luckda 0.0.25-9 → 0.0.25-af-2

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

@@ -2,17 +2,14 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React, { forwardRef, createContext, useState, useRef, useContext } from 'react';
+import React, { forwardRef, createContext, useState, useRef } from 'react';
 import { useRequest, useSetState, useMemoizedFn } from 'ahooks';
 import { BasicForm, BasicFormItem } from 'luck-design';
 import LdPop from "../LdPop";
 import { readModlue } from "../../services";
 import { doAction as doActionUtils } from "../../helper/action";
 import { formatMessage } from '@luck-design-biz/base/utils';
-export var LuckDaContext = /*#__PURE__*/createContext();
-export var useLDCtx = function useLDCtx() {
-  return useContext(LuckDaContext);
-};
+var LuckDaContext = /*#__PURE__*/createContext();
 var builder = function builder(WrappedComponent, moduleCode) {
   var Component = /*#__PURE__*/forwardRef(function (props, ref) {
     if (!moduleCode) return formatMessage({
@@ -134,4 +131,5 @@ var builder = function builder(WrappedComponent, moduleCode) {
   });
   return Component;
 };
-export default builder;
+export default builder;
+export { LuckDaContext };

package/es/components/LDActions/index.js

@@ -1,4 +1,5 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
@@ -9,7 +10,7 @@ import { useCreation, useMemoizedFn } from 'ahooks';
 import { Modal, recheck } from '@luck-design-biz/base';
 import { Button, Menu, Dropdown, Icon, Divider } from 'luck-design/antd';
 import classNames from 'classnames';
-import { reduce, isNil } from 'lodash';
+import { reduce } from 'lodash';
 import { getResources } from "../../helper/ldComBuild";
 import styles from "./index.less";
 var DisplayComp = function DisplayComp(_ref) {
@@ -46,7 +47,7 @@ var LDActions = function LDActions(_ref2) {
       Modal.confirm({
         title: "\u786E\u8BA4\u6267\u884C".concat(action.name, "\u884C\u4E3A\u64CD\u4F5C\u5417\uFF1F"),
         onOk: function onOk() {
-          return doAction(action.actionPool);
+          return doAction(action);
         }
       });
     } else if (action.riskLevel === 'destroy') {
@@ -54,30 +55,31 @@ var LDActions = function LDActions(_ref2) {
         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.actionPool);
+          return doAction(action);
         }
       });
     } else {
-      doAction(action.actionPool);
+      doAction(action);
     }
   });
   var actionMap = useCreation(function () {
     return reduce(todoList, function (ret, action, index) {
-      if (!isNil(action.serial) && !ret[action.serial]) {
-        ret[action.serial] = Math.pow(2, index);
-      }
+      ret[action.serial] = _objectSpread(_objectSpread({}, action), {}, {
+        serialValue: Math.pow(2, index)
+      });
       return ret;
     }, {});
   }, [todoList]);
   var mySerialsValue = useCreation(function () {
     return reduce(resources, function (ret, resKey) {
-      ret |= actionMap[resKey] || 0;
+      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 = useCreation(function () {
-      var approvedActions = reduce(todoList, function (ret, action) {
-        if (isNil(action.serial) || mySerialsValue & actionMap[action.serial]) {
+      var approvedActions = reduce(actionMap, function (ret, action) {
+        if (mySerialsValue & action.serialValue) {
           ret.push(action);
         } else if (action.serialEffect === 'disable') {
           ret.push(action);
@@ -87,7 +89,7 @@ var LDActions = function LDActions(_ref2) {
       var _length = approvedActions.length;
       var _permanent = approvedActions.splice(0, max >= _length ? _length : max - 1);
       return [_permanent, approvedActions];
-    }, [max, mySerialsValue, actionMap, todoList]),
+    }, [max, mySerialsValue, actionMap]),
     _useCreation2 = _slicedToArray(_useCreation, 2),
     permanent = _useCreation2[0],
     more = _useCreation2[1];
@@ -113,11 +115,8 @@ var LDActions = function LDActions(_ref2) {
     }, more.map(function (action) {
       return /*#__PURE__*/React.createElement(Menu.Item, {
         key: action.id,
-        action: action,
-        disabled: action.serialEffect === 'disable'
-      }, /*#__PURE__*/React.createElement("span", {
-        className: classNames(styles[action.riskLevel], styles.menuItem)
-      }, action.name));
+        action: action
+      }, action.name);
     }))
   }, /*#__PURE__*/React.createElement(DisplayComp, {
     display: display,

package/es/components/LDActions/index.less

@@ -1,68 +1,48 @@
-@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;
-}
+.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/es/components/LdAutoForm/index.js

@@ -2,10 +2,9 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey"];
 import React, { createRef, useContext } from 'react';
-import { reduce, keyBy, isEmpty, pick, union, omit } from 'lodash';
-import { BasicDivider } from 'luck-design';
+import { transform } from 'lodash';
 import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from "../../helper/ldBuilder";
 import { getFormItem, formItemDataFormat, dataFormat, behaviorCall } from "../../utils";
@@ -42,49 +41,31 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
     _ref$relationKey = _ref.relationKey,
     relationKey = _ref$relationKey === void 0 ? window.appConfig.constraintKeys.PRIMARY : _ref$relationKey,
-    fields = _ref.fields,
-    setVerifyRules = _ref.setVerifyRules,
     props = _objectWithoutProperties(_ref, _excluded);
   var _ref2 = useContext(LuckDaContext) || {},
     setFieldProps = _ref2.setFieldProps;
-  var defaultValues = /*#__PURE__*/createRef({});
+  var defaultValues = /*#__PURE__*/createRef();
   var isMain = ldId === mainFormLdId;
   var basicItems = function () {
-    var fieldsObj = keyBy(fields, 'field');
-    var columnsObj = keyBy(columns, 'field');
-    var keys = isEmpty(fields) ? Object.keys(columnsObj) : union(Object.keys(fieldsObj), Object.keys(columnsObj));
     var _defaultValues = {};
-    var _nodes = reduce(keys, function (result, key) {
-      var setting = fieldsObj[key];
-      var col = columnsObj[key];
-      if ((setting === null || setting === void 0 ? void 0 : setting._type) === 'divider') {
-        result.push( /*#__PURE__*/React.createElement(BasicDivider, {
-          title: setting === null || setting === void 0 ? void 0 : setting.aliasName
-        }));
-      } else if (col !== null && col !== void 0 && col.isShowInForm) {
-        var customFiled = filedsRewrite.find(function (_field) {
-          return _field.name === col.aliaName;
+    var _nodes = transform(columns, function (result, col) {
+      if (col.isShowInForm) {
+        var customFiled = filedsRewrite.find(function (field) {
+          return field.name === col.aliaName;
         }) || {};
         _defaultValues = _objectSpread(_objectSpread({}, _defaultValues), {}, _defineProperty(_defineProperty({}, col.aliaName, col['optDefaultValue']), "".concat(col.aliaName, "_virtual"), col['optDefaultValueCvt']));
-        var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
-        var newCol = _objectSpread(_objectSpread({}, col), {}, {
-          setVerifyRules: setVerifyRules,
-          fieldName: (setting === null || setting === void 0 ? void 0 : setting.aliasName) || col.fieldName
-        }, pick(setting, defaultSet));
-        result.push(getFormItem(newCol, _objectSpread(_objectSpread({
+        result.push(getFormItem(col, _objectSpread(_objectSpread({
           formId: ldId,
           moduleCode: moduleCode
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.aliaName, value)));
-          },
-          setting: omit(setting, [].concat(defaultSet, ['uid', 'field']))
+          }
         })));
       }
-      return result;
     }, []);
     defaultValues.current = _defaultValues;
-    setFieldProps && setFieldProps(_defineProperty({}, ldId, _nodes.map(function (i) {
+    setFieldProps(_defineProperty({}, ldId, _nodes.map(function (i) {
       return _objectSpread({
         component: i.type.comName || i.type.displayName
       }, i.props);
@@ -94,9 +75,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formConfig = {
     formId: ldId,
     isMain: isMain,
-    defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns.map(function (c) {
-      return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
-    }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
+    defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
   };
   var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -140,9 +119,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }
     }, onQuery), {}, {
       format: function format(data, res) {
-        var formItemData = _objectSpread({}, formItemDataFormat(columns.map(function (c) {
-          return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
-        }), data));
+        var formItemData = _objectSpread({}, formItemDataFormat(columns, data));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;
       }

package/es/components/LdCom/index.js

@@ -3,8 +3,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["options"];
 import React from 'react';
 import { Button, Tabs } from 'luck-design/antd';
-import { Collapse, ButtonRadio } from '@luck-design-biz/base';
-import IconFont from "../IconFont";
+import { Collapse, ButtonRadio, IconFont } from '@luck-design-biz/base';
 import { ldComBuilder, filterOptions, deepFilterCom } from "../../helper/ldComBuild";
 export var LdButton = ldComBuilder(Button);
 export var LdCollapse = ldComBuilder(Collapse);