fan-standard-comp 3.2.1 → 4.0.1

package/lib/RefactorTree/index.js

@@ -1,27 +1,27 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tree/style");
-var _tree = _interopRequireDefault(require("antd/es/tree"));
-require("antd/es/empty/style");
-var _empty = _interopRequireDefault(require("antd/es/empty"));
-require("antd/es/popconfirm/style");
-var _popconfirm = _interopRequireDefault(require("antd/es/popconfirm"));
-var _tslib = require("tslib");
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _index = _interopRequireDefault(require("../SpecIcon/index"));
 var _util = require("./util");
 require("./style/index.less");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _excluded = ["treeData", "rootName", "rootKey", "emptyDescription", "optionName", "defaultSelectedKeys", "nodeExtra", "selectable", "nodeControl", "limitKey", "checkedKeys", "checkStrictly", "onSelect", "onCheck", "titleRender", "disabledFields"]; // 重构树控件，可直接配置数据
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // 重构树控件，可直接配置数据
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+// @ts-ignore
+
 var RefactorTree = function RefactorTree(props) {
   var treeData = props.treeData,
     rootName = props.rootName,
@@ -46,14 +46,14 @@ var RefactorTree = function RefactorTree(props) {
     onCheck = props.onCheck,
     titleRender = props.titleRender,
     disabledFields = props.disabledFields,
-    otherProps = (0, _tslib.__rest)(props, ["treeData", "rootName", "rootKey", "emptyDescription", "optionName", "defaultSelectedKeys", "nodeExtra", "selectable", "nodeControl", "limitKey", "checkedKeys", "checkStrictly", "onSelect", "onCheck", "titleRender", "disabledFields"]); // const { title, value, children, disabled } = { value: 'value', title: 'title', children: 'children', disabled: 'disabled', ...optionName }
+    otherProps = _objectWithoutProperties(props, _excluded);
+  // const { title, value, children, disabled } = { value: 'value', title: 'title', children: 'children', disabled: 'disabled', ...optionName }
   // 重新组合指定数据源字段
   var transTreeData = (0, _react.useMemo)(function () {
-    var _ref;
     var afterTransData = (0, _util.transDataParam)(treeData, optionName); // 通过转换后的数据
     var resultData;
     // 如果有配置根节点,则添加 一个根节点数据
-    resultData = rootName ? [(_ref = {}, _defineProperty(_ref, optionName.title || 'title', rootName), _defineProperty(_ref, optionName.key || 'key', rootKey || '0'), _defineProperty(_ref, 'children', afterTransData), _ref)] : afterTransData;
+    resultData = rootName ? [_defineProperty(_defineProperty(_defineProperty({}, optionName.title || 'title', rootName), optionName.key || 'key', rootKey || '0'), 'children', afterTransData)] : afterTransData;
     // 有配置limitKey指定限制同级节点时，添加判断节点选择限制(在父子节点不相关联条件下使用checkStrictly=true)
     if (checkStrictly && limitKey && checkedKeys) {
       if (Array.isArray(checkedKeys) && checkedKeys.length > 0 || checkedKeys && Array.isArray(checkedKeys.checked) && checkedKeys.checked.length > 0) {
@@ -65,6 +65,7 @@ var RefactorTree = function RefactorTree(props) {
     }
     return resultData;
   }, [treeData, optionName, checkStrictly, limitKey, checkedKeys, disabledFields]);
+
   // console.log('重置后的数据', transTreeData)
   var handleToSelectTreeNode = function handleToSelectTreeNode(key, e) {
     var currentData = e.node;
@@ -109,7 +110,7 @@ var RefactorTree = function RefactorTree(props) {
       }
     }, /*#__PURE__*/_react.default.createElement(_index.default, {
       name: 'edit'
-    })), /*#__PURE__*/_react.default.createElement(_popconfirm.default, {
+    })), /*#__PURE__*/_react.default.createElement(_antd.Popconfirm, {
       placement: 'top',
       title: "\u786E\u5B9A\u8981\u5220\u9664\uFF1A".concat(item[optionName.title || 'title'], "\u5417\uFF1F"),
       icon: /*#__PURE__*/_react.default.createElement(_index.default, {
@@ -127,8 +128,8 @@ var RefactorTree = function RefactorTree(props) {
     })))) : null, nodeExtra && nodeExtra(item));
   };
   if (transTreeData.length == 0) {
-    return /*#__PURE__*/_react.default.createElement(_empty.default, {
-      image: _empty.default.PRESENTED_IMAGE_SIMPLE,
+    return /*#__PURE__*/_react.default.createElement(_antd.Empty, {
+      image: _antd.Empty.PRESENTED_IMAGE_SIMPLE,
       description: emptyDescription
     });
   } else {
@@ -138,7 +139,7 @@ var RefactorTree = function RefactorTree(props) {
     } else {
       defExpand = rootKey ? [rootKey] : ['0'];
     }
-    return /*#__PURE__*/_react.default.createElement(_tree.default, Object.assign({}, otherProps, {
+    return /*#__PURE__*/_react.default.createElement(_antd.Tree, _extends({}, otherProps, {
       onSelect: function onSelect(keys, e) {
         return handleToSelectTreeNode(keys, e);
       },
@@ -155,5 +156,4 @@ var RefactorTree = function RefactorTree(props) {
     }));
   }
 };
-var _default = RefactorTree;
-exports.default = _default;
+var _default = exports.default = RefactorTree;

package/lib/RefactorTree/style/index.less

@@ -1,22 +1,22 @@
-@root-entry-name: default;
-@import (reference) '~antd/es/style/themes/index';
-.treeControl a {
-  padding: 0 2px;
-  color: @text-color;
-  &:hover{
-    color: @primary-color;
-  }
-  &:first-child {
-    margin-left: 2px;
-  }
-}
-.spec-grid-left .ant-tree-node-selected {
-  .treeControl  a {
-    color: #fff;
-  }
-}
-.notPointer {
-  .ant-tree-node-content-wrapper {
-    cursor: default !important;
-  }
-}
+//@root-entry-name: default;
+//@import (reference) '~antd/es/style/themes/index';
+//.treeControl a {
+//  padding: 0 2px;
+//  color: @text-color;
+//  &:hover{
+//    color: @primary-color;
+//  }
+//  &:first-child {
+//    margin-left: 2px;
+//  }
+//}
+//.spec-grid-left .ant-tree-node-selected {
+//  .treeControl  a {
+//    color: #fff;
+//  }
+//}
+//.notPointer {
+//  .ant-tree-node-content-wrapper {
+//    cursor: default !important;
+//  }
+//}

package/lib/RefactorTree/util.d.ts

@@ -13,7 +13,7 @@ interface optionNameProps {
  * @params {object} optionName 选项字段值
  *
  * */
-export declare function transDataParam(array?: any[], optionName?: optionNameProps): any[];
+export declare function transDataParam(array: any[], optionName?: optionNameProps): any[] | null;
 /**
  * 根据限制字段limitKey进行重组数据
  *
@@ -25,7 +25,7 @@ export declare function transDataParam(array?: any[], optionName?: optionNamePro
  * @Return {array}  返回结果数据
  *
  * */
-export declare function resetDataWithLimit(hasKeys: any[], list: any[], optionName?: optionNameProps, limitKey?: string): any[];
+export declare function resetDataWithLimit(hasKeys: any[], list: any[], optionName: optionNameProps | undefined, limitKey: string): any[];
 /**
  * 根据指定禁用字段 disabledFields 进行重组数据
  *

package/lib/RefactorTree/util.js

@@ -6,13 +6,22 @@ Object.defineProperty(exports, "__esModule", {
 exports.resetDataWithDisabled = resetDataWithDisabled;
 exports.resetDataWithLimit = resetDataWithLimit;
 exports.transDataParam = transDataParam;
-var _tslib = require("tslib");
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+/* eslint-disable */
+// import * as React from 'react';
+
 /**
  * transDataParam 根据指定选项字段名重组数据
  *
@@ -41,14 +50,18 @@ function transDataParam(array) {
       if (item.hasOwnProperty(optionName.children || 'children')) {
         item.children = item[optionName.children || 'children'] ? trans(item[optionName.children || 'children']) : [];
       }
-      return Object.assign(Object.assign({}, item), {
+      return _objectSpread(_objectSpread({}, item), {}, {
         key: item[optionName.value || optionName.key || 'key'],
         title: item[optionName.title || 'title']
+        // children: trans(item[treeOptionName.children || 'children']),
+        // disabled: item[treeOptionName.disabled || 'disabled'],
+        // selectable: item[treeOptionName.selectable || 'selectable'],
       });
     });
   };
-  return trans(array);
+  return trans(array || []);
 }
+
 /**
  * 根据限制字段limitKey进行重组数据
  *
@@ -76,7 +89,7 @@ function resetDataWithLimit(hasKeys, list) {
     if (Array.isArray(preList) && preList.length > 0) {
       preList.forEach(function (item, i) {
         if (ids.includes(item[optionName.value || 'value'])) {
-          matchList.push(Object.assign({}, item));
+          matchList.push(_objectSpread({}, item));
         }
         if (item[optionName.children || 'children']) {
           matchList = matchList.concat(filterCheckedNode(ids, item[optionName.children || 'children']));
@@ -85,13 +98,14 @@ function resetDataWithLimit(hasKeys, list) {
     }
     return matchList;
   };
+
   // 筛选同一层级可选择，其他层级数据不可选择（限制按指定字段名的层级数据）
   var filterResetSameLevel = function filterResetSameLevel(preList, matchDataValue) {
     if (!preList) return [];
     if (!matchDataValue) return preList;
-    return preList === null || preList === void 0 ? void 0 : preList.map(function (preItem) {
-      var oldItem = Object.assign({}, preItem);
-      var item = (0, _tslib.__rest)(oldItem, []);
+    return (preList || []).map(function (preItem) {
+      var oldItem = _objectSpread({}, preItem);
+      var item = Object.assign({}, (_objectDestructuringEmpty(oldItem), oldItem));
       if (item[limitKey] !== matchDataValue) {
         item.disabled = true;
       } else if (item.hasOwnProperty(optionName.disabled || 'disabled')) {
@@ -101,7 +115,7 @@ function resetDataWithLimit(hasKeys, list) {
       item.isLimit = item[limitKey] !== matchDataValue;
       item.children = filterResetSameLevel(item['children'], matchDataValue);
       item[optionName.children || 'children'] = filterResetSameLevel(item[optionName.children || 'children'], matchDataValue);
-      return Object.assign({}, item);
+      return _objectSpread({}, item);
     });
   };
   // 先筛选出来选中节点的数据，取其中的 level 层级的值(数据必须保证同级类型值一致)
@@ -115,6 +129,7 @@ function resetDataWithLimit(hasKeys, list) {
     return newList;
   }
 }
+
 /**
  * 根据指定禁用字段 disabledFields 进行重组数据
  *
@@ -132,16 +147,16 @@ function resetDataWithDisabled(list, optionName, disabledFields) {
   var filterResetTargetFields = function filterResetTargetFields(preList, fields) {
     if (!preList) return [];
     return preList.map(function (preItem) {
-      var oldItem = Object.assign({}, preItem);
-      var item = (0, _tslib.__rest)(oldItem, []);
+      var oldItem = _objectSpread({}, preItem);
+      var item = Object.assign({}, (_objectDestructuringEmpty(oldItem), oldItem));
       Object.keys(item).forEach(function (itemKeyName) {
-        var _a;
-        var isMatch = fields.find(function (fItem) {
+        var isMatch = (fields || []).find(function (fItem) {
           return fItem.key === itemKeyName;
         });
         if (isMatch) {
+          var _isMatch$value$split;
           // 确认是否匹配数据，进行设置 disabled
-          if ((_a = isMatch.value.split(',')) === null || _a === void 0 ? void 0 : _a.includes(item[itemKeyName])) {
+          if ((_isMatch$value$split = isMatch.value.split(',')) !== null && _isMatch$value$split !== void 0 && _isMatch$value$split.includes(item[itemKeyName])) {
             item.disabled = true;
           } else if (item.hasOwnProperty(optionName.disabled || 'disabled')) {
             item.disabled = item[optionName.disabled || 'disabled'];
@@ -151,7 +166,7 @@ function resetDataWithDisabled(list, optionName, disabledFields) {
           item.children = filterResetTargetFields(item[itemKeyName], fields);
         }
       });
-      return Object.assign({}, item);
+      return _objectSpread({}, item);
     });
   };
   var prevList = list && Array.isArray(list) ? _toConsumableArray(list) : [];