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

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

@@ -0,0 +1,92 @@
+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 _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["wrapperRef", "config", "renderInfoMode", "complexConfig"];
+import React, { useState, forwardRef } from 'react';
+import { getDvaApp } from 'umi';
+import { Tag } from 'luck-design/antd';
+import { isArray } from 'lodash';
+import { TreeSelector } from '@luck-design-biz/base';
+import { formatMessage, dataToTree } from '@luck-design-biz/base/utils';
+import { BasicFormItem } from 'luck-design';
+import api from "@/services/ApiConfig";
+import { fetchContent } from "./service";
+var Index = function Index(_ref) {
+  var wrapperRef = _ref.wrapperRef,
+    _ref$config = _ref.config,
+    config = _ref$config === void 0 ? {} : _ref$config,
+    renderInfoMode = _ref.renderInfoMode,
+    _ref$complexConfig = _ref.complexConfig,
+    _ref$complexConfig$is = _ref$complexConfig.isTree,
+    isTree = _ref$complexConfig$is === void 0 ? false : _ref$complexConfig$is,
+    moduleCode = _ref$complexConfig.moduleCode,
+    dataModel = _ref$complexConfig.dataModel,
+    dataSetCode = _ref$complexConfig.dataSetCode,
+    keyField = _ref$complexConfig.keyField,
+    valueField = _ref$complexConfig.valueField,
+    props = _objectWithoutProperties(_ref, _excluded);
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    dataSource = _useState2[0],
+    setDataSource = _useState2[1];
+  var handleFocus = function handleFocus() {
+    if (!dataSource || dataSource.length === 0) {
+      fetchContent(dataModel, {
+        datasetCode: dataSetCode,
+        moduleCode: moduleCode
+      }).then(function (res) {
+        var code = res.code,
+          data = res.data;
+        if (code === 1) {
+          var formatData = data.map(function (i) {
+            return _objectSpread(_objectSpread({}, i), {}, {
+              key: i[keyField],
+              value: i[keyField],
+              label: valueField.length > 0 ? valueField.split(',').map(function (val) {
+                return i[val];
+              }).join('-') : '',
+              title: valueField.length > 0 ? valueField.split(',').map(function (val) {
+                return i[val];
+              }).join('-') : ''
+            });
+          });
+          if (isTree) {
+            setDataSource(dataToTree(formatData, null, 'uid', 'parent_uid'));
+          } else setDataSource(formatData);
+        }
+      });
+    }
+  };
+  return renderInfoMode ? renderInfoMode(function (value) {
+    return (config.multiple || config.mode === 'multiple') && isArray(value) ? value.map(function (item) {
+      return /*#__PURE__*/React.createElement(Tag, {
+        key: item.key
+      }, item.label || item.value || item.key);
+    }) : /*#__PURE__*/React.createElement("span", null, value.label || value.value || value.key);
+  }) : /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, props, {
+    type: isTree ? 'treeSelect' : 'select',
+    ref: wrapperRef,
+    config: _objectSpread(_objectSpread({
+      required: false,
+      placeholder: formatMessage({
+        id: 'app.base.tip.select'
+      }),
+      message: formatMessage({
+        id: 'app.base.tip.select'
+      })
+    }, config), {}, _defineProperty(_defineProperty({
+      showSearch: true,
+      optionFilterProp: 'title',
+      treeNodeFilterProp: 'label'
+    }, isTree ? 'treeData' : 'dataSource', dataSource), "onFocus", handleFocus))
+  }));
+};
+var RefCom = /*#__PURE__*/forwardRef(function (props, ref) {
+  return /*#__PURE__*/React.createElement(Index, _extends({
+    wrapperRef: ref
+  }, props));
+});
+RefCom.displayName = 'BasicFormItem';
+export default RefCom;

package/es/components/ComplexItem/service.js

@@ -0,0 +1,21 @@
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import { stringify } from 'qs';
+import { request } from '@luck-design-biz/base/utils';
+import api from "@/services/ApiConfig";
+export var fetchContent = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(dmCode, get) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", request("".concat(api.API_HOST, "/").concat(dmCode, "/ui/builder/complex/noAuthFetchContent?").concat(stringify(get))));
+        case 1:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function fetchContent(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();

package/es/components/LDActions/index.js

@@ -1,5 +1,4 @@
 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";
@@ -10,7 +9,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 } from 'lodash';
+import { reduce, isNil } from 'lodash';
 import { getResources } from "../../helper/ldComBuild";
 import styles from "./index.less";
 var DisplayComp = function DisplayComp(_ref) {
@@ -64,22 +63,21 @@ var LDActions = function LDActions(_ref2) {
   });
   var actionMap = useCreation(function () {
     return reduce(todoList, function (ret, action, index) {
-      ret[action.serial] = _objectSpread(_objectSpread({}, action), {}, {
-        serialValue: Math.pow(2, index)
-      });
+      if (!isNil(action.serial) && !ret[action.serial]) {
+        ret[action.serial] = Math.pow(2, index);
+      }
       return ret;
     }, {});
   }, [todoList]);
   var mySerialsValue = useCreation(function () {
     return reduce(resources, function (ret, resKey) {
-      var _actionMap$resKey;
-      ret |= ((_actionMap$resKey = actionMap[resKey]) === null || _actionMap$resKey === void 0 ? void 0 : _actionMap$resKey.serialValue) || 0;
+      ret |= actionMap[resKey] || 0;
       return ret;
     }, 0);
   }, [resources, actionMap]);
   var _useCreation = useCreation(function () {
-      var approvedActions = reduce(actionMap, function (ret, action) {
-        if (mySerialsValue & action.serialValue) {
+      var approvedActions = reduce(todoList, function (ret, action) {
+        if (isNil(action.serial) || mySerialsValue & actionMap[action.serial]) {
           ret.push(action);
         } else if (action.serialEffect === 'disable') {
           ret.push(action);
@@ -89,7 +87,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]),
+    }, [max, mySerialsValue, actionMap, todoList]),
     _useCreation2 = _slicedToArray(_useCreation, 2),
     permanent = _useCreation2[0],
     more = _useCreation2[1];

package/es/components/LDActions/index.less

@@ -1,65 +1,68 @@
-@spanDefault: #262626;
-@spanPrimary: var(--luck-color-primary);
-@spanDanger: #ff4d4f;
-@spanDestroy: #820014;
-
-.ldActions {
-
-  button:not(:last-child) {
-    margin-right: 8px;
-  }
-  span {
-    cursor: pointer;
-  }
-
-  button.default {
-    background-color: white;
-  }
-  span.default {
-    color: @spanDefault;
-  }
-
-  button.primary {
-    background-color: var(--luck-color-primary);
-    border-color: var(--luck-color-primary);
-    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/LdAutoForm/index.js

@@ -2,13 +2,26 @@ 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"];
+var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules"];
 import React, { createRef, useContext } from 'react';
-import { transform } from 'lodash';
+import { reduce, keyBy, isEmpty, pick, union, omit, forEach, debounce } from 'lodash';
+import { BasicDivider } from 'luck-design';
 import { AutoForm } from '@luck-design-biz/base/FormList';
 import ldBuilder from "../../helper/ldBuilder";
 import { getFormItem, formItemDataFormat, dataFormat, behaviorCall } from "../../utils";
 import { LuckDaContext } from "../Builder";
+var didMount = false;
+var debounceFunc = debounce(function (fields, changedValues, allValues, props) {
+  forEach(changedValues, function (val, key) {
+    var _field$events;
+    var field = fields.find(function (f) {
+      return f.field === key;
+    });
+    if (field !== null && field !== void 0 && (_field$events = field.events) !== null && _field$events !== void 0 && _field$events.onValueChange) {
+      field.events.onValueChange(val, key, allValues, props);
+    }
+  });
+}, 300);
 var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -41,28 +54,46 @@ 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 = transform(columns, function (result, col) {
-      if (col.isShowInForm) {
-        var customFiled = filedsRewrite.find(function (field) {
-          return field.name === col.aliaName;
+    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.fieldAliasName
+        }));
+      } else if (col !== null && col !== void 0 && 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']));
-        result.push(getFormItem(col, _objectSpread(_objectSpread({
+        var defaultSet = ['col', 'row', 'note', 'tip', 'placeholder'];
+        var newCol = _objectSpread(_objectSpread({}, col), {}, {
+          setVerifyRules: setVerifyRules,
+          fieldName: (setting === null || setting === void 0 ? void 0 : setting.fieldAliasName) || col.fieldName
+        }, pick(setting, defaultSet));
+        result.push(getFormItem(newCol, _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) {
@@ -75,7 +106,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
   var formConfig = {
     formId: ldId,
     isMain: isMain,
-    defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns, defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
+    defaultDataSource: _objectSpread(_objectSpread({}, formItemDataFormat(columns.map(function (c) {
+      return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
+    }), defaultValues.current)), defaultDataSourceFormat(defaultValues.current))
   };
   var onOperate = function onOperate() {
     var _onOperate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -109,6 +142,9 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
     });
   };
   return /*#__PURE__*/React.createElement(AutoForm, _extends({}, props, {
+    onDataLoaded: function onDataLoaded() {
+      didMount = true;
+    },
     onQuery: _objectSpread(_objectSpread({
       api: behaviorCall,
       get: function get(formData) {
@@ -119,14 +155,23 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }
     }, onQuery), {}, {
       format: function format(data, res) {
-        var formItemData = _objectSpread({}, formItemDataFormat(columns, data));
+        var formItemData = _objectSpread({}, formItemDataFormat(columns.map(function (c) {
+          return _objectSpread(_objectSpread({}, c), keyBy(fields, 'field')[c.field]);
+        }), data));
         if (onQuery !== null && onQuery !== void 0 && onQuery.format) return onQuery.format(data, formItemData, res); // 以预设为主
         return formItemData;
       }
     })
     // onAdd={onOperate(onAdd, 'add')}
     ,
-    onUpdate: onOperate(onUpdate, 'update')
+    onUpdate: onOperate(onUpdate, 'update'),
+    formOption: {
+      onValuesChange: function onValuesChange(props, changedValues, allValues) {
+        if (didMount) {
+          debounceFunc(fields, changedValues, allValues, props);
+        }
+      }
+    }
   }, formConfig), basicItems);
 };
 export default ldBuilder(buildLdAutoForm);