@teamix/pro 1.6.0-beta.6 → 1.6.1-beta

package/es/table/utils/genAutoWidthColumns.js

@@ -0,0 +1,327 @@
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+import React, { createRef } from 'react';
+import { getTargetValue } from '@teamix/utils';
+import { renderCell } from './pureColumnRender';
+import { renderColumnsTitle } from './columnRender';
+import { ProActionGroup } from '../../actions';
+import { getProFieldWidth } from '@teamix/pro-field';
+import { renderCellSmartWidth } from './columnRender';
+// 最大宽度
+var maxColumnWidth = 600;
+// 最小宽度
+var minColumnWidth = 48;
+// 每个列可以缩减的最大宽度
+var columnShrinkMaxWidth = 100;
+/**
+ * @param fileteredColumns
+ * @param ref
+ * @param data
+ * @returns
+ */
+export function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection, actionColumnRef) {
+  if (!ref.current) {
+    return fileteredColumns;
+  }
+  var hasLockFlag = false;
+  var dom = ref.current;
+  var actionColumnDom = actionColumnRef === null || actionColumnRef === void 0 ? void 0 : actionColumnRef.current;
+  var childNodes = dom.children;
+  var finalColumns = [];
+  fileteredColumns.forEach(function (column, index) {
+    var render = column.render,
+      _column$valueType = column.valueType,
+      valueType = _column$valueType === void 0 ? 'text' : _column$valueType,
+      _column$autoWidth = column.autoWidth,
+      autoWidth = _column$autoWidth === void 0 ? true : _column$autoWidth,
+      actionSchema = column.actionSchema,
+      sortable = column.sortable,
+      lock = column.lock;
+    if (lock) {
+      hasLockFlag = true;
+    }
+    //@ts-ignore
+    var type = render === null || render === void 0 ? void 0 : render.type;
+    var finalType = type || valueType || '';
+    var shrink = fieldTypeShrink[finalType];
+    column.shrink = column.shrink || (shrink !== undefined ? shrink : 1);
+    //@ts-ignore
+    // if (!autoWidth) {
+    //   finalColumns.push(column);
+    //   return;
+    // }
+    if (actionSchema) {
+      // TODO 操作列暂时未处理，但是应该根据actionSchema的数量直接推测出操作列的宽度
+      // console.log('column', column);
+      column.shrink = 0;
+      // column.width = 280;
+      // console.log(
+      //   'actionColumnDom',
+      //   actionColumnDom?.childNodes[0].scrollWidth,
+      // );
+      if (actionColumnDom === null || actionColumnDom === void 0 ? void 0 : actionColumnDom.childNodes[0]) {
+        //@ts-ignore
+        var width = actionColumnDom === null || actionColumnDom === void 0 ? void 0 : actionColumnDom.childNodes[0].scrollWidth;
+        if (width >= 280) {
+          width = 280;
+        }
+        column.width = defaultPaddingFixer(width, size, false);
+      }
+      finalColumns.push(column);
+      return;
+    }
+    // @ts-ignore
+    var titleWidth = childNodes[index].children[0].scrollWidth;
+    // @ts-ignore
+    if (fixedWidthTypeList[finalType]) {
+      // console.log(
+      //   'fixedWidthTypeList[finalType]',
+      //   fixedWidthTypeList[finalType],
+      // );
+      // 固定宽度
+      column.width = defaultPaddingFixer(
+      // @ts-ignore
+      Math.max(titleWidth, fixedWidthTypeList[finalType]), size, index === 0 && useRowSelection);
+      // @ts-ignore
+    } else if (computeableWidthTypeList[finalType]) {
+      // 可计算宽度
+      column.width = defaultPaddingFixer(
+      // @ts-ignore
+      Math.max(titleWidth, computeableWidthTypeList[finalType](data, render)), size, index === 0 && useRowSelection);
+    } else {
+      // 直接根据 dom 计算
+      column.width = defaultPaddingFixer(Math.max(titleWidth,
+      // @ts-ignore
+      calcWidthWithParentDOM(childNodes[index], column.shrink)), size, index === 0 && useRowSelection);
+    }
+    if (index === 0) {
+      // 首列不会被挤占
+      column.shrink = 0;
+    }
+    finalColumns.push(column);
+  });
+  if (!hasLockFlag) {
+    // 如果没有锁列的情况，需要将所有列放到一屏内，此时需要将所有列放到一起计算一次
+    var containerWidth = dom.offsetWidth;
+    var comboColumns = calcMultiColumnLength(finalColumns, useRowSelection ? containerWidth - 50 : containerWidth);
+    return comboColumns;
+  }
+  return finalColumns;
+}
+export var shadowContainer = function shadowContainer(props) {
+  var ref = /*#__PURE__*/createRef();
+  var columns = props.columns,
+    data = props.data,
+    shadowContainerRef = props.shadowContainerRef;
+  return /*#__PURE__*/React.createElement("div", {
+    ref: shadowContainerRef,
+    className: "teamix-pro-table-shadow-container"
+  }, columns.map(function (column, index) {
+    var dataIndex = column.dataIndex,
+      valueType = column.valueType;
+    if (!(column === null || column === void 0 ? void 0 : column.actionSchema)) {
+      return /*#__PURE__*/React.createElement("div", {
+        className: "teamix-pro-table-shadow-container-columns",
+        key: index
+      }, /*#__PURE__*/React.createElement("div", null, renderColumnsTitle(column, ref)),
+      //@ts-ignore
+      !computeableWidthTypeList[valueType] &&
+      //@ts-ignore
+      !fixedWidthTypeList[valueType] && data.map(function (item, index) {
+        // @ts-ignore
+        column.smartWidth = renderCellSmartWidth(getValueFromRecord(dataIndex, item), column, index, item);
+        return renderCell(getValueFromRecord(dataIndex, item), column, index, item);
+      }));
+    }
+  }));
+};
+export var shadowActionColumnContainer = function shadowActionColumnContainer(columns, shadowActionColumnContainerRef) {
+  var actionColumn = columns.find(function (column) {
+    return column === null || column === void 0 ? void 0 : column.actionSchema;
+  });
+  if (actionColumn === null || actionColumn === void 0 ? void 0 : actionColumn.actionSchema) {
+    return /*#__PURE__*/React.createElement("div", {
+      ref: shadowActionColumnContainerRef,
+      className: "teamix-pro-table-action-column-shadow-container"
+    }, /*#__PURE__*/React.createElement(ProActionGroup, _objectSpread(_objectSpread({
+      type: "text"
+    }, actionColumn === null || actionColumn === void 0 ? void 0 : actionColumn.actionSchema), {}, {
+      context: _objectSpread({}, actionColumn === null || actionColumn === void 0 ? void 0 : actionColumn.actionSchema.context)
+    })));
+  }
+};
+// 计算操作列的宽度
+function getValueFromRecord(dataIndex, record) {
+  if (!dataIndex) {
+    return null;
+  }
+  if (Array.isArray(dataIndex)) {
+    var value = dataIndex.map(function (item) {
+      return getTargetValue("{{".concat(item, "}}"), _objectSpread(_objectSpread({}, record), {}, {
+        record: record
+      }));
+    });
+    return value;
+  } else {
+    var result = record;
+    var array = dataIndex.split('.');
+    array.forEach(function (item) {
+      return result = result ? result[item] : undefined;
+    });
+    return result;
+  }
+}
+// TODO 某些可以直接算出结果的 profield 类型白名单，待补充，每个类型下支持一个函数，用当前值和渲染类型算出一个结果
+export var computeableWidthTypeList = {
+  dateTime: function dateTime(data, render) {
+    var result = getProFieldWidth('dateTime', render);
+    // @ts-ignore
+    return (result === null || result === void 0 ? void 0 : result.minWidth) || 0;
+  }
+};
+// TODO 某些固定宽度的 profield 类型白名单，这里的数据可能需要综合考虑 dataFold 和 render.rows
+export var fixedWidthTypeList = {
+  // 时间日期
+  // dateTime: 142,
+  // dateMonth: 74, // 60
+  // dateWeek: 74,
+  // date: 100,
+  // dateYear: 46,
+  // dateQuarter: 64,
+  // dateRange: 212,
+  dateWeekRange: 156,
+  dateMonthRange: 156,
+  dateYearRange: 102,
+  dateQuarterRange: 136,
+  dateTimeRange: 326,
+  time: 38,
+  timeRange: 124
+};
+// TODO 不同类型的 profield 的 shrink，0表示不可以省略号，数字越大越容易被挤占空间
+export var fieldTypeShrink = {
+  tag: 0,
+  statusTag: 0,
+  statusIconTag: 0,
+  circle: 0,
+  rank: 0,
+  progress: 0,
+  money: 0,
+  number: 0,
+  percent: 0,
+  dateTime: 0,
+  ip: 0
+};
+function calcWidthWithParentDOM(dom, shrink) {
+  var childNodes = _toConsumableArray(dom.children);
+  childNodes.shift();
+  return calcSingleColumnLength(childNodes.map(function (node) {
+    return node.scrollWidth;
+  }), shrink);
+}
+function calcSingleColumnLength() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var shrink = arguments.length > 1 ? arguments[1] : undefined;
+  if (shrink === 0) {
+    return Math.ceil(Math.max.apply(null, list));
+  }
+  return getConfidence90UpperBound(list);
+}
+/**
+ * 根据所有列的宽度和权重，结合总宽度，计算出各个列合适的宽度
+ * 目前算法：
+ * 当前需要的总宽度-总宽度=需要降低的宽度
+ * 从后往前，将shrink不为0的列，降低一些宽度到最小宽度
+ * 最小宽度可以用百分比去算
+ * TODO 当前shrink只用了0，其他的权重也要考虑一下
+ * @param list
+ * @param max
+ * @returns
+ */
+function calcMultiColumnLength() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var max = arguments.length > 1 ? arguments[1] : undefined;
+  var result = _toConsumableArray(list);
+  var targetList = [];
+  var needWidth = 0;
+  var canShrink = 0;
+  list.forEach(function (item) {
+    //@ts-ignore
+    needWidth += item.width;
+    if (item.shrink !== 0) {
+      targetList.push(item);
+      //@ts-ignore
+      canShrink += Math.min(item.width - minColumnWidth, columnShrinkMaxWidth);
+    }
+  });
+  var widthToBeRemoved = needWidth - max;
+  if (widthToBeRemoved <= 0) {
+    return list;
+  }
+  // TODO 超过的特别多直接加锁列，这个逻辑怎么设计
+  // 目前用可以缩小的宽度加起来比较一下
+  if (canShrink < widthToBeRemoved) {
+    list[0].lock = 'left';
+    if (list[list.length - 1].actionSchema) {
+      list[list.length - 1].lock = 'right';
+    }
+    return list;
+  }
+  //@ts-ignore
+  var sortedList = targetList.sort(function (a, b) {
+    return a.width - b.width;
+  });
+  var shrinkedWidth = 0;
+  for (var i = sortedList.length - 1; i >= 0; i--) {
+    if (shrinkedWidth >= widthToBeRemoved) {
+      break;
+    }
+    var singleShrinkedWidth = Math.min(sortedList[i].width - minColumnWidth, columnShrinkMaxWidth, widthToBeRemoved - shrinkedWidth);
+    sortedList[i].width = sortedList[i].width - singleShrinkedWidth;
+    shrinkedWidth += singleShrinkedWidth;
+  }
+  return result;
+}
+/**
+ * 修正内容放在table中默认的padding
+ * @param width
+ * @returns
+ */
+function defaultPaddingFixer(width) {
+  var size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'medium';
+  var half = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  return size === 'medium' ? width + (half ? 16 : 32) + 0.5 : width + (half ? 8 : 16) + 0.5;
+}
+function sum() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return list.reduce(function (a, b) {
+    return a + b;
+  });
+}
+/**
+ * 假设样本正态分布，取 90% 置信区间的上界
+ * 当上界与最大值差距不大(目前是20)的时候，直接用最大值
+ * TODO 这里没考虑是否可以直接用标准差做评判依据，如标准差过大时，直接排序并展示前90%，或标准差很小时直接用最大值
+ * TODO 这里极限情况是不是会挂？ 如：长度为9个100和2个10000，估计会挂，是否置信区间这个不靠谱。。。最差情况就直接展示90%的数据算了
+ */
+function getConfidence90UpperBound() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var max = Math.max.apply(null, list);
+  var length = list.length;
+  var mean = sum(list) / length;
+  var std = Math.sqrt(sum(list.map(function (n) {
+    return (n - mean) * (n - mean);
+  })) / length);
+  var interval = length > 30 ? 1.65 * std / Math.sqrt(length) : 2.2622 * std / Math.sqrt(length);
+  var bound = Math.ceil(mean + interval);
+  if (max - bound < 20) {
+    return Math.min(max, maxColumnWidth);
+  }
+  return Math.min(bound, maxColumnWidth);
+}

package/es/table/xconsole.scss

@@ -0,0 +1,6 @@
+.theme-xconsole {
+  .next-menu-item-inner {
+    display: flex;
+    align-items: center;
+  }
+}

package/lib/actions/index.d.ts

@@ -1,15 +1,15 @@
-import { TooltipProps } from '@alicloudfe/components/types/balloon';
+import React, { ReactNode } from 'react';
 import { ButtonProps } from '@alicloudfe/components/types/button';
 import { MenuButtonProps } from '@alicloudfe/components/types/menu-button';
-import React, { ReactNode } from 'react';
+import { TooltipProps } from '@alicloudfe/components/types/balloon';
+import { LinkAction } from './link';
+import { RequestAction } from './request';
 import { DialogAction } from './dialog';
 import { DialogFormAction } from './dialog-form';
-import { DialogInfoAction } from './dialog-info';
 import { DialogTableAction } from './dialog-table';
-import './index.scss';
-import { LinkAction } from './link';
+import { DialogInfoAction } from './dialog-info';
 import { PopConfirmAction } from './pop-confirm';
-import { RequestAction } from './request';
+import './index.scss';
 export declare type ProActionConfig = ({
     type: 'dialog-form' | 'drawer-form';
 } & DialogFormAction) | ({

package/lib/actions/index.js

@@ -18,28 +18,28 @@ exports.ProActionGroup = ProActionGroup;
 exports.default = exports.ProActionMenuButton = void 0;
 exports.registerActionHandler = registerActionHandler;
 exports.useAction = useAction;
+var _react = _interopRequireDefault(require("react"));
+var _classnames = _interopRequireDefault(require("classnames"));
 var _components = require("@alicloudfe/components");
 var _icon = _interopRequireDefault(require("@teamix/icon"));
 var _utils = require("@teamix/utils");
-var _classnames = _interopRequireDefault(require("classnames"));
-var _react = _interopRequireDefault(require("react"));
+var _link = require("./link");
+var _request = require("./request");
+var _dialog = require("./dialog");
 var _confirm = require("./confirm");
 var _dangerConfirm = require("./danger-confirm");
-var _dangerPopConfirm = require("./danger-pop-confirm");
-var _dialog = require("./dialog");
+var _notice = require("./notice");
+var _error = require("./error");
 var _dialogForm = require("./dialog-form");
-var _dialogInfo = require("./dialog-info");
 var _dialogTable = require("./dialog-table");
+var _dialogInfo = require("./dialog-info");
 var _drawer = require("./drawer");
 var _drawerForm = require("./drawer-form");
-var _drawerInfo = require("./drawer-info");
 var _drawerTable = require("./drawer-table");
-var _error = require("./error");
-require("./index.scss");
-var _link = require("./link");
-var _notice = require("./notice");
+var _drawerInfo = require("./drawer-info");
 var _popConfirm = require("./pop-confirm");
-var _request = require("./request");
+var _dangerPopConfirm = require("./danger-pop-confirm");
+require("./index.scss");
 var _quick = require("./quick");
 Object.keys(_quick).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/form/Components/FormItem2/index.js

@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.FormItem2 = exports.BaseItem = void 0;
-var _components = require("@alicloudfe/components");
-var _core = require("@formily/core");
-var _react = require("@formily/react");
+var _react = _interopRequireWildcard(require("react"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _react2 = _interopRequireWildcard(require("react"));
-var _formLayout = require("../form-layout");
 var _builtins__ = require("../__builtins__");
+var _core = require("@formily/core");
+var _react2 = require("@formily/react");
+var _formLayout = require("../form-layout");
+var _components = require("@alicloudfe/components");
 var _excluded = ["children"];
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -50,19 +50,19 @@ var useFormItemLayout = function useFormItemLayout(props) {
     feedbackIcon: props.feedbackIcon,
     feedbackLayout: (_ref3 = (_props$feedbackLayout = props.feedbackLayout) !== null && _props$feedbackLayout !== void 0 ? _props$feedbackLayout : layout.feedbackLayout) !== null && _ref3 !== void 0 ? _ref3 : 'loose',
     tooltipLayout: (_ref4 = (_props$tooltipLayout = props.tooltipLayout) !== null && _props$tooltipLayout !== void 0 ? _props$tooltipLayout : layout.tooltipLayout) !== null && _ref4 !== void 0 ? _ref4 : 'icon',
-    tooltipIcon: (_ref5 = (_props$tooltipIcon = props.tooltipIcon) !== null && _props$tooltipIcon !== void 0 ? _props$tooltipIcon : layout.tooltipIcon) !== null && _ref5 !== void 0 ? _ref5 : /*#__PURE__*/_react2.default.createElement(_builtins__.QuestionCircleOutlinedIcon, null)
+    tooltipIcon: (_ref5 = (_props$tooltipIcon = props.tooltipIcon) !== null && _props$tooltipIcon !== void 0 ? _props$tooltipIcon : layout.tooltipIcon) !== null && _ref5 !== void 0 ? _ref5 : /*#__PURE__*/_react.default.createElement(_builtins__.QuestionCircleOutlinedIcon, null)
   });
 };
 function useOverflow() {
-  var _useState = (0, _react2.useState)(false),
+  var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     overflow = _useState2[0],
     setOverflow = _useState2[1];
-  var containerRef = (0, _react2.useRef)();
-  var contentRef = (0, _react2.useRef)();
+  var containerRef = (0, _react.useRef)();
+  var contentRef = (0, _react.useRef)();
   var layout = (0, _formLayout.useFormLayout)();
   var labelCol = JSON.stringify(layout.labelCol);
-  (0, _react2.useEffect)(function () {
+  (0, _react.useEffect)(function () {
     requestAnimationFrame(function () {
       if (containerRef.current && contentRef.current) {
         var contentWidth = contentRef.current.getBoundingClientRect().width;
@@ -82,16 +82,16 @@ function useOverflow() {
   };
 }
 var ICON_MAP = {
-  error: /*#__PURE__*/_react2.default.createElement(_builtins__.CloseCircleOutlinedIcon, null),
-  success: /*#__PURE__*/_react2.default.createElement(_builtins__.CheckCircleOutlinedIcon, null),
-  warning: /*#__PURE__*/_react2.default.createElement(_builtins__.ExclamationCircleOutlinedIcon, null)
+  error: /*#__PURE__*/_react.default.createElement(_builtins__.CloseCircleOutlinedIcon, null),
+  success: /*#__PURE__*/_react.default.createElement(_builtins__.CheckCircleOutlinedIcon, null),
+  warning: /*#__PURE__*/_react.default.createElement(_builtins__.ExclamationCircleOutlinedIcon, null)
 };
 var BaseItem = function BaseItem(props) {
   var _cls, _cls3, _cls4, _cls5, _cls6;
   console.log('FormItem2');
   var children = props.children,
     others = _objectWithoutProperties(props, _excluded);
-  var _useState3 = (0, _react2.useState)(false),
+  var _useState3 = (0, _react.useState)(false),
     _useState4 = _slicedToArray(_useState3, 2),
     active = _useState4[0],
     setActive = _useState4[1];
@@ -153,35 +153,34 @@ var BaseItem = function BaseItem(props) {
   }
   var prefixCls = (0, _builtins__.usePrefixCls)('formily-item', props);
   var prefix = (0, _builtins__.usePrefixCls)();
-  console.log('feedbackLayout', feedbackLayout);
-  var formatChildren = feedbackLayout === 'popover' || feedbackLayout === 'hover-popover' ? /*#__PURE__*/_react2.default.createElement(_components.Balloon, _objectSpread({
+  var formatChildren = (feedbackLayout === 'popover' || feedbackLayout === 'hover-popover') && !!feedbackText ? /*#__PURE__*/_react.default.createElement(_components.Balloon, _objectSpread({
     needAdjust: true,
     align: "t",
     closable: false,
     trigger: children
   }, feedbackLayout === 'popover' ? {
     visible: !!feedbackText
-  } : {}), /*#__PURE__*/_react2.default.createElement("div", {
+  } : {}), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)((_cls = {}, _defineProperty(_cls, "".concat(prefixCls, "-").concat(feedbackStatus, "-help"), !!feedbackStatus), _defineProperty(_cls, "".concat(prefixCls, "-help"), true), _cls))
   }, ICON_MAP[feedbackStatus !== null && feedbackStatus !== void 0 ? feedbackStatus : ''], " ", feedbackText)) : children;
   var gridStyles = {};
   var getOverflowTooltip = function getOverflowTooltip() {
     if (overflow) {
-      return /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement("div", null, label), /*#__PURE__*/_react2.default.createElement("div", null, tooltip));
+      return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", null, label), /*#__PURE__*/_react.default.createElement("div", null, tooltip));
     }
     return tooltip;
   };
   var renderLabelText = function renderLabelText() {
-    var labelChildren = /*#__PURE__*/_react2.default.createElement("div", {
+    var labelChildren = /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames.default)("".concat(prefixCls, "-label-content")),
       ref: containerRef
-    }, /*#__PURE__*/_react2.default.createElement("span", {
+    }, /*#__PURE__*/_react.default.createElement("span", {
       ref: contentRef
-    }, asterisk && /*#__PURE__*/_react2.default.createElement("span", {
+    }, asterisk && /*#__PURE__*/_react.default.createElement("span", {
       className: (0, _classnames.default)("".concat(prefixCls, "-asterisk"))
-    }, '*'), /*#__PURE__*/_react2.default.createElement("label", null, label)));
+    }, '*'), /*#__PURE__*/_react.default.createElement("label", null, label)));
     if (tooltipLayout === 'text' && tooltip || overflow) {
-      return /*#__PURE__*/_react2.default.createElement(_components.Balloon.Tooltip, {
+      return /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, {
         align: "t",
         trigger: labelChildren
       }, getOverflowTooltip());
@@ -190,9 +189,9 @@ var BaseItem = function BaseItem(props) {
   };
   var renderTooltipIcon = function renderTooltipIcon() {
     if (tooltip && tooltipLayout === 'icon' && !overflow) {
-      return /*#__PURE__*/_react2.default.createElement("span", {
+      return /*#__PURE__*/_react.default.createElement("span", {
         className: (0, _classnames.default)("".concat(prefixCls, "-label-tooltip-icon"))
-      }, /*#__PURE__*/_react2.default.createElement(_components.Balloon.Tooltip, {
+      }, /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, {
         align: "t",
         trigger: tooltipIcon
       }, tooltip));
@@ -201,16 +200,16 @@ var BaseItem = function BaseItem(props) {
   var renderLabel = function renderLabel() {
     var _cls2;
     if (!label) return null;
-    return /*#__PURE__*/_react2.default.createElement("div", {
+    return /*#__PURE__*/_react.default.createElement("div", {
       className: (0, _classnames.default)((_cls2 = {}, _defineProperty(_cls2, "".concat(prefixCls, "-label"), true), _defineProperty(_cls2, "".concat(prefixCls, "-label-tooltip"), tooltip && tooltipLayout === 'text' || overflow), _defineProperty(_cls2, "".concat(prefixCls, "-item-col-").concat(labelCol), enableCol && !!labelCol), _cls2)),
       style: labelStyle
-    }, renderLabelText(), renderTooltipIcon(), asterisk && /*#__PURE__*/_react2.default.createElement("span", {
+    }, renderLabelText(), renderTooltipIcon(), asterisk && /*#__PURE__*/_react.default.createElement("span", {
       className: (0, _classnames.default)("".concat(prefixCls, "-asterisk-pro"))
-    }), label !== ' ' && /*#__PURE__*/_react2.default.createElement("span", {
+    }), label !== ' ' && /*#__PURE__*/_react.default.createElement("span", {
       className: (0, _classnames.default)("".concat(prefixCls, "-colon"))
     }, colon ? ':' : ''));
   };
-  return /*#__PURE__*/_react2.default.createElement("div", _objectSpread(_objectSpread({}, (0, _builtins__.pickDataProps)(props)), {}, {
+  return /*#__PURE__*/_react.default.createElement("div", _objectSpread(_objectSpread({}, (0, _builtins__.pickDataProps)(props)), {}, {
     style: _objectSpread(_objectSpread({}, style), gridStyles),
     "data-grid-span": props.gridSpan,
     className: (0, _classnames.default)((_cls3 = {}, _defineProperty(_cls3, "".concat(prefixCls), true), _defineProperty(_cls3, "".concat(prefixCls, "-layout-").concat(layout), true), _defineProperty(_cls3, "".concat(prefixCls, "-").concat(feedbackStatus), !!feedbackStatus), _defineProperty(_cls3, "".concat(prefixCls, "-feedback-has-text"), !!feedbackText), _defineProperty(_cls3, "".concat(prefixCls, "-size-").concat(size), !!size), _defineProperty(_cls3, "".concat(prefixCls, "-feedback-layout-").concat(feedbackLayout), !!feedbackLayout), _defineProperty(_cls3, "".concat(prefixCls, "-fullness"), !!fullness || !!inset || !!feedbackIcon), _defineProperty(_cls3, "".concat(prefixCls, "-inset"), !!inset), _defineProperty(_cls3, "".concat(prefix, "input"), !!inset), _defineProperty(_cls3, "".concat(prefixCls, "-active"), active), _defineProperty(_cls3, "".concat(prefix, "focus"), active), _defineProperty(_cls3, "".concat(prefixCls, "-extra-wrap"), extra), _defineProperty(_cls3, "".concat(prefixCls, "-inset-active"), !!inset && active), _defineProperty(_cls3, "".concat(prefixCls, "-label-align-").concat(labelAlign), true), _defineProperty(_cls3, "".concat(prefixCls, "-control-align-").concat(wrapperAlign), true), _defineProperty(_cls3, "".concat(prefixCls, "-label-wrap"), !!labelWrap), _defineProperty(_cls3, "".concat(prefixCls, "-control-wrap"), !!wrapperWrap), _defineProperty(_cls3, "".concat(prefixCls, "-bordered-none"), bordered === false), _defineProperty(_cls3, props === null || props === void 0 ? void 0 : props.className, !!props.className), _cls3)),
@@ -224,32 +223,32 @@ var BaseItem = function BaseItem(props) {
         setActive(false);
       }
     }
-  }), renderLabel(), /*#__PURE__*/_react2.default.createElement("div", {
+  }), renderLabel(), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)((_cls4 = {}, _defineProperty(_cls4, "".concat(prefixCls, "-control"), true), _defineProperty(_cls4, "".concat(prefixCls, "-item-col-").concat(wrapperCol), enableCol && !!wrapperCol && label), _cls4))
-  }, /*#__PURE__*/_react2.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(prefixCls, "-control-content"))
-  }, addonBefore && /*#__PURE__*/_react2.default.createElement("div", {
+  }, addonBefore && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(prefixCls, "-addon-before"))
-  }, addonBefore), /*#__PURE__*/_react2.default.createElement("div", {
+  }, addonBefore), /*#__PURE__*/_react.default.createElement("div", {
     style: wrapperStyle,
     className: (0, _classnames.default)((_cls5 = {}, _defineProperty(_cls5, "".concat(prefixCls, "-control-content-component"), true), _defineProperty(_cls5, "".concat(prefixCls, "-control-content-component-has-feedback-icon"), !!feedbackIcon), _defineProperty(_cls5, "".concat(prefix, "input"), !!feedbackIcon), _defineProperty(_cls5, "".concat(prefixCls, "-active"), active), _defineProperty(_cls5, "".concat(prefix, "focus"), active), _cls5))
-  }, /*#__PURE__*/_react2.default.createElement(_formLayout.FormLayoutShallowContext.Provider, {
+  }, /*#__PURE__*/_react.default.createElement(_formLayout.FormLayoutShallowContext.Provider, {
     value: {
       size: size
     }
-  }, formatChildren), feedbackIcon && /*#__PURE__*/_react2.default.createElement("div", {
+  }, formatChildren), feedbackIcon && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(prefixCls, "-feedback-icon"))
-  }, feedbackIcon)), addonAfter && /*#__PURE__*/_react2.default.createElement("div", {
+  }, feedbackIcon)), addonAfter && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(prefixCls, "-addon-after"))
-  }, addonAfter)), !!feedbackText && feedbackLayout !== 'popover' && feedbackLayout !== 'hover-popover' && feedbackLayout !== 'none' && /*#__PURE__*/_react2.default.createElement("div", {
+  }, addonAfter)), !!feedbackText && feedbackLayout !== 'popover' && feedbackLayout !== 'hover-popover' && feedbackLayout !== 'none' && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)((_cls6 = {}, _defineProperty(_cls6, "".concat(prefixCls, "-").concat(feedbackStatus, "-help"), !!feedbackStatus), _defineProperty(_cls6, "".concat(prefixCls, "-help"), true), _defineProperty(_cls6, "".concat(prefixCls, "-help-enter"), true), _defineProperty(_cls6, "".concat(prefixCls, "-help-enter-active"), true), _cls6))
-  }, feedbackText), extra && /*#__PURE__*/_react2.default.createElement("div", {
+  }, feedbackText), extra && /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)("".concat(prefixCls, "-extra"))
   }, extra)));
 };
 // 适配
 exports.BaseItem = BaseItem;
-var FormItem2 = (0, _react.connect)(BaseItem, (0, _react.mapProps)(function (props, field) {
+var FormItem2 = (0, _react2.connect)(BaseItem, (0, _react2.mapProps)(function (props, field) {
   if ((0, _core.isVoidField)(field)) return {
     label: field.title || props.label,
     asterisk: props.asterisk,

package/lib/form/Components/__builtins__/icons.js

@@ -4,10 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.UpOutlinedIcon = exports.QuestionCircleOutlinedIcon = exports.PlusOutlinedIcon = exports.MessageOutlinedIcon = exports.MenuOutlinedIcon = exports.Icon = exports.ExclamationCircleOutlinedIcon = exports.EditOutlinedIcon = exports.DownOutlinedIcon = exports.DeleteOutlinedIcon = exports.CopyOutlinedIcon = exports.CloseOutlinedIcon = exports.CloseCircleOutlinedIcon = exports.CheckCircleOutlinedIcon = void 0;
-var _components = require("@alicloudfe/components");
-var _classnames = _interopRequireDefault(require("classnames"));
 var _react = _interopRequireDefault(require("react"));
+var _classnames = _interopRequireDefault(require("classnames"));
 var _usePrefixCls = require("./hooks/usePrefixCls");
+var _components = require("@alicloudfe/components");
 var _excluded = ["text"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }

package/lib/form/Components/__builtins__/index.d.ts

@@ -1,8 +1,8 @@
-export * from './empty';
+export * from './moment';
 export * from './hooks';
-export * from './icons';
-export * from './loading';
-export * from './mapSize';
 export * from './mapStatus';
-export * from './moment';
+export * from './mapSize';
+export * from './empty';
+export * from './loading';
 export * from './pickDataProps';
+export * from './icons';