@teamix/pro 1.4.17 → 1.4.18

package/dist/pro.js

@@ -64029,7 +64029,7 @@ var FieldIcon = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forwar
   var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
       _useState4 = _slicedToArray(_useState3, 2),
       balloonVisible = _useState4[0],
-      setBalloonVisible = _useState4[1]; // 类型 基础/混合云业务...
+      setBalloonVisible = _useState4[1]; // 类型 基础/专有云业务...
 
 
   var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)('混合云基础图标'),
@@ -71153,17 +71153,101 @@ function renderArrayNodes(nodes, render) {
 /* harmony import */ var ___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(35511);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(59787);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);
+var _excluded = ["className"];
+
+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;
+}
+
+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;
+}
+
 
 
 
 
 var Overlay = function Overlay(props) {
-  var _render$overlayTrigge;
+  var _render$overlayProps, _render$overlayTrigge;
 
   var result = props.result,
       render = props.render,
       fieldValue = props.fieldValue;
 
+  var _ref = (_render$overlayProps = render.overlayProps) !== null && _render$overlayProps !== void 0 ? _render$overlayProps : {},
+      _ref$className = _ref.className,
+      className = _ref$className === void 0 ? '' : _ref$className,
+      otherOverlayProps = _objectWithoutProperties(_ref, _excluded);
+
   var renderContent = function renderContent() {
     if ( /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_2__.isValidElement)(render.overlay)) {
       return render.overlay;
@@ -71176,15 +71260,15 @@ var Overlay = function Overlay(props) {
     });
   };
 
-  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Balloon, {
-    className: "teamix-pro-field-output-overlay",
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Balloon, _objectSpread({
+    className: "teamix-pro-field-output-overlay ".concat(className),
     trigger: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement("div", {
       className: "teamix-pro-field-output-overlay-trigger"
     }, result),
     triggerType: (_render$overlayTrigge = render.overlayTriggerType) !== null && _render$overlayTrigge !== void 0 ? _render$overlayTrigge : 'hover',
     closable: false,
     needAdjust: true
-  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement("div", {
+  }, otherOverlayProps), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2___default().createElement("div", {
     className: "teamix-pro-field-output-overlay-content"
   }, renderContent()));
 };
@@ -74224,7 +74308,8 @@ ProPageContainer.Tab = _tab__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z;
 /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var _index__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(20701);
 var _excluded = ["key", "path"],
-    _excluded2 = ["activeKey", "children"];
+    _excluded2 = ["activeKey", "children"],
+    _excluded3 = ["children"];
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -74353,12 +74438,16 @@ var ProPageContainerTab = function ProPageContainerTab(props) {
       var items = []; // 此处不能用 React.Children.map，会改变 element 的 key
 
       react__WEBPACK_IMPORTED_MODULE_0___default().Children.forEach(children, function (element) {
-        var _element$props;
+        var _element$props2;
+
+        var _element$props = element.props,
+            children = _element$props.children,
+            others = _objectWithoutProperties(_element$props, _excluded3);
 
-        items.push( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Tab.Item, {
-          title: element === null || element === void 0 ? void 0 : (_element$props = element.props) === null || _element$props === void 0 ? void 0 : _element$props.title,
+        items.push( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Tab.Item, _objectSpread({
+          title: element === null || element === void 0 ? void 0 : (_element$props2 = element.props) === null || _element$props2 === void 0 ? void 0 : _element$props2.title,
           key: element === null || element === void 0 ? void 0 : element.key
-        }));
+        }, others)));
       });
       registerSwitch( /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Tab, _objectSpread({
         activeKey: activeKey
@@ -74373,9 +74462,9 @@ var ProPageContainerTab = function ProPageContainerTab(props) {
   if (registerSwitch) {
     var content = react__WEBPACK_IMPORTED_MODULE_0___default().Children.map(children, function (element) {
       if ((element === null || element === void 0 ? void 0 : element.key) === activeKey) {
-        var _element$props2;
+        var _element$props3;
 
-        return element === null || element === void 0 ? void 0 : (_element$props2 = element.props) === null || _element$props2 === void 0 ? void 0 : _element$props2.children;
+        return element === null || element === void 0 ? void 0 : (_element$props3 = element.props) === null || _element$props3 === void 0 ? void 0 : _element$props3.children;
       }
 
       return null;
@@ -76400,7 +76489,7 @@ function useDialogTableAction(action, context) {
 /* harmony import */ var _base__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(54842);
 /* harmony import */ var _request__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(67096);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(95983);
-var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel"],
+var _excluded = ["trigger", "url", "customRequest", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError", "onOk", "onCancel", "hideFooter"],
     _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "className"];
 
 function _extends() { _extends = Object.assign || 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); }
@@ -76482,6 +76571,7 @@ function useDialogAction(action, actionContext, hasForm) {
         onError = action.onError,
         propsOnOk = action.onOk,
         propsOnCancel = action.onCancel,
+        hideFooter = action.hideFooter,
         others = _objectWithoutPropertiesLoose(action, _excluded);
 
     var _getTargetValue = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getTargetValue)(others, context),
@@ -76612,7 +76702,7 @@ function useDialogAction(action, actionContext, hasForm) {
     });
     var dialogContent = Component ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, (0,_utils__WEBPACK_IMPORTED_MODULE_10__/* .addContext */ .F)(componentProps, dialogContext)) : addContextForReactNode(content, dialogContext);
 
-    var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = onOk, _extends2.onCancel = function onCancel() {
+    var quickShowProps = _extends((_extends2 = {}, _extends2["" + (isPop ? 'onConfirm' : 'onOk')] = hideFooter && !isPop && isDrawer ? false : onOk, _extends2.onCancel = hideFooter && !isPop && isDrawer ? false : function () {
       propsOnCancel && propsOnCancel(context);
     }, _extends2.title = addContextForReactNode(title, dialogContext), _extends2.content = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, beforeContent && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "teamix-pro-dialog-before-content"
@@ -76626,7 +76716,12 @@ function useDialogAction(action, actionContext, hasForm) {
       className: classnames__WEBPACK_IMPORTED_MODULE_1___default()('teamix-pro-dialog-footer-description', getFooterAlignClass(isDrawer, footerAlign))
     }, renderDialogFooterDescription(footerDescription))), _extends2.footerAlign = footerAlign, _extends2.className = classnames__WEBPACK_IMPORTED_MODULE_1___default()('teamix-pro-action-dialog', {
       'has-footer-description': !!footerDescription
-    }), _extends2), containerProps, containerOtherProps);
+    }), _extends2), containerProps, containerOtherProps); // TODO Drawer 基础组件未支持此配置，日后支持，并修改onOk、onCancel写法
+
+
+    if (!dialogType || dialogType === 'dialog') {
+      quickShowProps['footer'] = !hideFooter;
+    }
 
     var ret = container.show(quickShowProps);
     store.hide = ret ? ret.hide || ret.close : function () {};
@@ -77638,11 +77733,11 @@ var ProCard = function ProCard(props) {
 
   var _formatSpacing = (0,_utils__WEBPACK_IMPORTED_MODULE_10__/* .formatSpacing */ .A)(spacing),
       horizonal = _formatSpacing.horizonal,
-      vertical = _formatSpacing.vertical; // useEffect(() => {
-  //   calculateHeaderWidth();
-  // }, []);
-
+      vertical = _formatSpacing.vertical;
 
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
+    calculateHeaderWidth();
+  }, []);
   var hasDivider = (divider || !!split) && (title || extra);
   var hasCollapse = collapsible === true || defaultCollapsed !== undefined || collapsed !== undefined;
   var collapseState = collapsed !== undefined ? collapsed : innerCollapseState;
@@ -77791,7 +77886,9 @@ var ProCard = function ProCard(props) {
     free: true,
     className: cardClassName,
     style: style,
-    actions: renderActionGroup(actions, context)
+    actions: renderActionGroup(actions, context) // @ts-ignore
+    ,
+    ref: cardRef
   }, others), !loading && image && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_3__.Card.Media, {
     component: "img",
     src: image
@@ -82664,7 +82761,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
 
 
 
-var version = '1.4.17';
+var version = '1.4.18';
 
 
 /***/ }),
@@ -83294,16 +83391,19 @@ var ProBaseInfo = function ProBaseInfo(props) {
     var newWrapperSpan = formItemLayout.wrapperCol.span; // 计算合并列情况。label与wrapper需要重新计算
 
     if (colspan) {
-      newLabelSpan = newLabelSpan / colspan;
+      var _layout$span, _layout$span2;
+
+      var realColspan = ((_layout$span = layout == null ? void 0 : layout.span) != null ? _layout$span : 24 / defaultLayout.span > colspan) ? colspan : (_layout$span2 = layout == null ? void 0 : layout.span) != null ? _layout$span2 : 24 / defaultLayout.span;
+      newLabelSpan = newLabelSpan / realColspan;
       newWrapperSpan = newWrapperSpan + (formItemLayout.labelCol.span - newLabelSpan);
     }
 
     var newFormItemLayout = {
       labelCol: {
-        span: newLabelSpan
+        span: newLabelSpan.toFixed()
       },
       wrapperCol: {
-        span: newWrapperSpan
+        span: newWrapperSpan.toFixed()
       }
     };
     return Object.assign(formItemLayout, newFormItemLayout);
@@ -83311,7 +83411,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _ref, _ref2, _layout$span, _layout$span2, _item$title, _item$valueType, _ref3, _item$colSpan;
+      var _ref, _ref2, _layout$span3, _layout$span4, _item$title, _item$valueType, _ref3, _item$colSpan;
 
       var hidden = (0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .isHidden */ .xj)(item == null ? void 0 : item.hidden, (0,_utils__WEBPACK_IMPORTED_MODULE_5__/* .getDataIndexValue */ .vc)(item.dataIndex, (_ref = dataSource != null ? dataSource : result) != null ? _ref : {}), (_ref2 = dataSource != null ? dataSource : result) != null ? _ref2 : {}, context);
 
@@ -83319,10 +83419,10 @@ var ProBaseInfo = function ProBaseInfo(props) {
         return;
       }
 
-      var span = item.colSpan ? defaultLayout.span * item.colSpan : defaultLayout.span;
-      var layoutSpan = item.colSpan ? ((_layout$span = layout == null ? void 0 : layout.span) != null ? _layout$span : span) * item.colSpan : (_layout$span2 = layout == null ? void 0 : layout.span) != null ? _layout$span2 : span;
+      var span = item.colSpan ? defaultLayout.span : defaultLayout.span;
+      var layoutSpan = item.colSpan ? ((_layout$span3 = layout == null ? void 0 : layout.span) != null ? _layout$span3 : span) * item.colSpan : (_layout$span4 = layout == null ? void 0 : layout.span) != null ? _layout$span4 : span;
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(Col, {
-        span: layoutSpan,
+        span: layoutSpan > 24 ? 24 : layoutSpan,
         key: index
       }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_ProInfoItem__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, {
         label: (_item$title = item == null ? void 0 : item.title) != null ? _item$title : '',
@@ -87860,7 +87960,7 @@ var Layout = function Layout(props) {
         actionRef: actionRef,
         quickAction: extra,
         rowSelection: rowSelection
-      }), !(dataFilter != null && (_dataFilter$schema3 = dataFilter.schema) != null && _dataFilter$schema3.length) && renderQueryFilter())), (dataFilter == null ? void 0 : (_dataFilter$schema4 = dataFilter.schema) == null ? void 0 : _dataFilter$schema4.length) && renderQueryFilter());
+      }), !(dataFilter != null && (_dataFilter$schema3 = dataFilter.schema) != null && _dataFilter$schema3.length) && !afterDataFilter && renderQueryFilter())), (dataFilter == null ? void 0 : (_dataFilter$schema4 = dataFilter.schema) == null ? void 0 : _dataFilter$schema4.length) > 0 || afterDataFilter && renderQueryFilter());
     } else if (!header && mainAction) {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, renderQueryFilter());
     } else if (!header && !mainAction) {
@@ -92801,7 +92901,7 @@ var lightCategoryColor = {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-// 混合云暗色主题图表配置
+// 专有云暗色主题图表配置
 var chartDarkTheme = {
   category_12: [],
   linear_10: ['#307ac9', '#285585', '#203041', '#2c67a7', '#244263', '#1e2630', '#2e71b8', '#2a5e96', '#264c74', '#223952'],
@@ -92873,7 +92973,7 @@ var chartDarkTheme = {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-// 混合云亮色主题图表配置
+// 专有云亮色主题图表配置
 var chartLightTheme = {
   category_12: [],
   linear_10: ['#297acc', '#75aae0', '#cee1f5', '#4d91d6', '#a0c5eb', '#e6f0fa', '#3b85d1', '#609edb', '#8ab7e6', '#b6d3f0'],