@teamix/pro 1.2.9 → 1.2.13

package/lib/actions/index.js

@@ -235,18 +235,20 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
   }, buttonProps), buttonContent(children, icon, undefined, context));
 };
 
-function renderCommonActionButtonMenuItem(action, context) {
+function renderCommonActionButtonMenuItem(action, key, context) {
   var menuBtn = action;
 
   if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
     return /*#__PURE__*/_react.default.createElement(_components.Menu.SubMenu, {
+      key: key,
       label: menuBtn.label || menuBtn.children
     }, menuBtn.actions.map(function (a, j) {
-      return renderCommonActionButtonMenuItem(a, context);
+      return renderCommonActionButtonMenuItem(a, String(j), context);
     }));
   }
 
   return /*#__PURE__*/_react.default.createElement(ProActionMenuButtonItem, {
+    key: key,
     action: action,
     context: context
   });
@@ -275,8 +277,8 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
     },
     type: type,
     label: buttonContent(label || children, icon, iconSize, context)
-  }, others), actions.map(function (action) {
-    return renderCommonActionButtonMenuItem(action, context);
+  }, others), actions.map(function (action, i) {
+    return renderCommonActionButtonMenuItem(action, String(i), context);
   }));
 }; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
 
@@ -383,7 +385,9 @@ function ProActionGroup(props) {
     })
   }, containerProps), formatedActions.map(function (actionBtn, i) {
     var isLastOne = i === formatedActions.length - 1;
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/_react.default.createElement(_components.Divider, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
+      key: i
+    }, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/_react.default.createElement(_components.Divider, {
       direction: "ver"
     }));
   }));

package/lib/actions/index.scss

@@ -28,6 +28,19 @@
     flex-shrink: 0;
   }
 }
+.next-dialog.teamix-pro-action-dialog {
+  &.has-footer-description {
+    .next-message {
+      position: static;
+    }
+  }
+
+  &.quick-show-confirm-or-alert {
+    .teamix-pro-dialog-footer-description {
+      bottom: var(--dialog-footer-padding-bottom, 20px);
+    }
+  }
+}
 
 .teamix-pro-dialog-footer-description {
   position: absolute;
@@ -48,12 +61,6 @@
   }
 }
 
-.teamix-pro-action-dialog.has-footer-description {
-  .next-message {
-    position: static;
-  }
-}
-
 .teamix-pro-dialog-before-content {
   margin-bottom: var(--s-2);
 }
@@ -61,7 +68,7 @@
 .teamix-pro-dialog-message {
   margin-bottom: var(--s-2);
 
-  &+.next-loading {
+  & + .next-loading {
     .teamix-pro-form {
       margin-top: 20px;
     }
@@ -89,3 +96,17 @@
     margin-bottom: 0px;
   }
 }
+
+.next-dialog-body {
+  .teamix-pro-info {
+    .next-card-content-container {
+      margin-top: 10px;
+      padding-bottom: 10px;
+      .next-col.next-col-24:last-child {
+        .teamix-pro-field-info-form-item:last-child {
+          padding-bottom: 0px;
+        }
+      }
+    }
+  }
+}

package/lib/actions/link.d.ts

@@ -2,7 +2,7 @@ import { LocationHistory } from '@teamix/utils';
 import { BaseAction } from './base';
 export interface LinkAction extends BaseAction, LocationHistory {
 }
-export declare function useLinkAction(action: LinkAction, context?: any): {
-    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+export declare function useLinkAction(action: LinkAction, actionContext?: any): {
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useLinkAction;

package/lib/actions/link.js

@@ -18,9 +18,9 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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 useLinkAction(action, context) {
+function useLinkAction(action, actionContext) {
   var history = (0, _reactRouterDom.useHistory)();
-  return _objectSpread({}, (0, _base.eventHandler)(action, function () {
+  return _objectSpread({}, (0, _base.eventHandler)(action, actionContext, function (context) {
     var linkAction = (0, _utils.getTargetValue)(action, context);
     (0, _utils.goToLink)(linkAction, history);
   }));

package/lib/actions/notice.d.ts

@@ -2,6 +2,6 @@ import { DialogAction } from './dialog';
 export interface NoticeAction extends DialogAction {
 }
 export declare function useNoticeAction(action: DialogAction, context?: any): {
-    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => Promise<void>;
 };
 export default useNoticeAction;

package/lib/actions/request.d.ts

@@ -3,7 +3,7 @@ import { BaseAction } from './base';
 export interface RequestAction extends CommonRequestConfig, BaseAction {
 }
 export declare function doRequest(action: RequestAction, context?: any, history?: any, extraParams?: any): Promise<unknown>;
-export declare function useRequestAction(action: RequestAction, context?: any): {
+export declare function useRequestAction(action: RequestAction, actionContext?: any): {
     loading: boolean;
 };
 export default useRequestAction;

package/lib/actions/request.js

@@ -51,7 +51,7 @@ function doRequest(action, context, history, extraParams) {
   }, others), context, history, extraParams);
 }
 
-function useRequestAction(action, context) {
+function useRequestAction(action, actionContext) {
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       loading = _useState2[0],
@@ -62,7 +62,7 @@ function useRequestAction(action, context) {
   var onFinish = action.onFinish,
       others = _objectWithoutProperties(action, _excluded2);
 
-  return _objectSpread(_objectSpread({}, (0, _base.eventHandler)(action, function () {
+  return _objectSpread(_objectSpread({}, (0, _base.eventHandler)(action, actionContext, function (context) {
     setLoading(true);
     doRequest(_objectSpread({}, others), context, history).then(function () {
       setLoading(false);

package/lib/card/index.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { ProTagItem } from '../utils/components/tags';
 import { ProActionGroupProps } from '../actions';
 import './index.scss';
 export * from './card-container';
@@ -13,6 +14,8 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
     tooltip?: React.ReactNode;
     /** 标题右侧图标 */
     tooltipIcon?: React.ReactNode;
+    /** 标签组 */
+    tags?: ProTagItem[];
     /** 标题右侧描述 */
     description?: React.ReactNode;
     /** 额外信息区域，位于卡片右上角，可以配置一些常用轻量操作 */
@@ -35,6 +38,8 @@ export interface ProCardProps extends Omit<React.HTMLAttributes<HTMLElement>, 't
     centered?: boolean;
     /** 加载中状态 */
     loading?: boolean;
+    /** 空状态 */
+    empty?: boolean;
     /** 边框颜色 */
     borderColor?: 'blue' | 'green' | 'red' | 'orange' | 'yellow' | 'grey' | 'transparent' | 'none';
     /** 背景色 */
@@ -83,9 +88,13 @@ export declare const ProCard: {
         (props: import("./selectable").ProCardSelectableProps): JSX.Element;
         defaultProps: {
             hoveredShadow: boolean;
-        };
+        }; /** 标签组 */
         isProCard: boolean;
     };
+    Tab: {
+        (props: import("@alifd/next/types/tab").TabProps): JSX.Element;
+        Item: typeof import("@alifd/next/types/tab").Item;
+    };
     isProCard: boolean;
 };
 export default ProCard;

package/lib/card/index.js

@@ -12,12 +12,16 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames3 = _interopRequireDefault(require("classnames"));
 
+var _result = _interopRequireDefault(require("@teamix/result"));
+
 var _components = require("@alicloudfe/components");
 
 var _icon = _interopRequireDefault(require("@teamix/icon"));
 
 var _utils = require("@teamix/utils");
 
+var _tags = require("../utils/components/tags");
+
 var _skeleton = require("../skeleton");
 
 var _actions = require("../actions");
@@ -28,6 +32,8 @@ var _divider = _interopRequireDefault(require("./divider"));
 
 var _selectable = _interopRequireDefault(require("./selectable"));
 
+var _tab = _interopRequireDefault(require("./tab"));
+
 require("./index.scss");
 
 var _cardContainer = require("./card-container");
@@ -44,7 +50,7 @@ Object.keys(_cardContainer).forEach(function (key) {
   });
 });
 var _excluded = ["context"],
-    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "description", "extra", "actions", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
+    _excluded2 = ["children", "title", "subTitle", "tooltip", "tooltipIcon", "tags", "description", "extra", "actions", "style", "className", "image", "hoveredShadow", "divider", "bordered", "compacted", "centered", "loading", "empty", "borderColor", "backgroundColor", "contentClassName", "contentStyle", "direction", "wrap", "spacing", "split", "collapsible", "defaultCollapsed", "collapsed", "onCollapse", "context"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -109,6 +115,7 @@ var ProCard = function ProCard(props) {
       subTitle = props.subTitle,
       tooltip = props.tooltip,
       tooltipIcon = props.tooltipIcon,
+      tags = props.tags,
       description = props.description,
       extra = props.extra,
       actions = props.actions,
@@ -121,6 +128,7 @@ var ProCard = function ProCard(props) {
       compacted = props.compacted,
       centered = props.centered,
       loading = props.loading,
+      empty = props.empty,
       borderColor = props.borderColor,
       backgroundColor = props.backgroundColor,
       contentClassName = props.contentClassName,
@@ -212,7 +220,7 @@ var ProCard = function ProCard(props) {
   }, _defineProperty(_classnames, "border-".concat(borderColor), borderColor), _defineProperty(_classnames, "compacted", compacted), _defineProperty(_classnames, "hoverable", hoveredShadow), _classnames));
   var cardContentClassName = (0, _classnames3.default)(cls('content'), contentClassName, getFlexDirectionClassName(direction, split), (_classnames2 = {
     'contain-pro-card': containProCard
-  }, _defineProperty(_classnames2, "split-".concat(split), split), _defineProperty(_classnames2, 'flex-wrap', wrap), _defineProperty(_classnames2, "centered", centered), _classnames2));
+  }, _defineProperty(_classnames2, "split-".concat(split), split), _defineProperty(_classnames2, 'flex-wrap', wrap), _defineProperty(_classnames2, "centered", centered || empty), _classnames2));
   var cardContentMargin = containProCard && !split ? {
     marginRight: -horizonal,
     marginLeft: -horizonal,
@@ -247,7 +255,7 @@ var ProCard = function ProCard(props) {
     }, /*#__PURE__*/_react.default.createElement(_components.Balloon.Tooltip, {
       align: "t",
       trigger: tooltipTrigger
-    }, tooltip)), description && /*#__PURE__*/_react.default.createElement("div", {
+    }, tooltip)), tags && (0, _tags.renderTags)(tags, 'small'), description && /*#__PURE__*/_react.default.createElement("div", {
       className: cls('title-description')
     }, description));
   };
@@ -272,7 +280,16 @@ var ProCard = function ProCard(props) {
   }, loading && /*#__PURE__*/_react.default.createElement(_skeleton.ProSkeletonRaw.Card.Content, null), !loading && /*#__PURE__*/_react.default.createElement("div", {
     className: cardContentClassName,
     style: cardContentStyle
-  }, childrenModified)));
+  }, empty && /*#__PURE__*/_react.default.createElement("div", {
+    className: cls('empty')
+  }, childrenModified ? childrenModified : /*#__PURE__*/_react.default.createElement(_result.default, {
+    theme: "hybridcloud-container",
+    img: "noData",
+    title: (0, _utils.getMessage)('noData'),
+    style: {
+      padding: '50px 0 60px'
+    }
+  })), !empty && childrenModified)));
 };
 
 exports.ProCard = ProCard;
@@ -283,6 +300,7 @@ ProCard.defaultProps = {
 };
 ProCard.Divider = _divider.default;
 ProCard.Selectable = _selectable.default;
+ProCard.Tab = _tab.default;
 ProCard.isProCard = true;
 var _default = ProCard;
 exports.default = _default;

package/lib/card/index.scss

@@ -153,6 +153,25 @@
     }
   }
 
+  &-tab {
+    margin-top: calc(0px - var(--s-2));
+
+    & > .next-tabs-bar {
+      border-bottom: none;
+    }
+
+    & > .next-tabs-content {
+      padding-top: var(--s-5, 20px);
+    }
+  }
+
+  &-empty {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    color: var(--color-text1-8, #848484);
+  }
+
   & > .next-card-actions {
     & > .teamix-pro-actions {
       & > .next-btn {

package/lib/card/tab.d.ts

@@ -0,0 +1,6 @@
+import { TabProps } from '@alicloudfe/components/types/tab';
+declare const ProCardTab: {
+    (props: TabProps): JSX.Element;
+    Item: typeof import("@alifd/next/types/tab").Item;
+};
+export default ProCardTab;

package/lib/card/tab.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _components = require("@alicloudfe/components");
+
+var _excluded = ["className"];
+
+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); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { 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 ProCardTab = function ProCardTab(props) {
+  var className = props.className,
+      others = _objectWithoutProperties(props, _excluded);
+
+  return /*#__PURE__*/_react.default.createElement(_components.Tab, _objectSpread({
+    className: (0, _classnames.default)('teamix-pro-card-tab', className)
+  }, others));
+};
+
+ProCardTab.Item = _components.Tab.Item;
+var _default = ProCardTab;
+exports.default = _default;

package/lib/form/Filter/index.d.ts

@@ -1,16 +1,13 @@
 import React from 'react';
 import type { IFilterProps } from '../typing';
+import './index.scss';
 /**
  * 简单筛选
  */
 declare const SimpleFilter: React.FC<IFilterProps>;
-/**
- * 查询筛选
- */
-declare const QueryFilter: React.FC<IFilterProps>;
 /**
  * 高级筛选
  */
 declare const AdvancedFilter: React.FC<IFilterProps>;
-export { AdvancedFilter, SimpleFilter, QueryFilter };
+export { AdvancedFilter, SimpleFilter };
 export default AdvancedFilter;

package/lib/form/Filter/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.SimpleFilter = exports.QueryFilter = exports.AdvancedFilter = void 0;
+exports.default = exports.SimpleFilter = exports.AdvancedFilter = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -19,8 +19,9 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 
 var _utils2 = require("../utils");
 
-var _excluded = ["schema", "triggerType", "onFilter"],
-    _excluded2 = ["schema", "triggerType", "onFilter"];
+require("./index.scss");
+
+var _excluded = ["schema", "triggerType", "onFilter"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -110,52 +111,10 @@ exports.SimpleFilter = SimpleFilter;
 SimpleFilter.defaultProps = {
   triggerType: 'change'
 };
-/**
- * 查询筛选
- */
-
-var QueryFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
-  var schema = props.schema,
-      triggerType = props.triggerType,
-      onFilter = props.onFilter,
-      otherProps = _objectWithoutProperties(props, _excluded2);
-
-  var prefixCls = (0, _utils.usePrefixCls)('', {
-    prefix: 'teamix-pro-form-filter-query'
-  });
-  var querySchema = (0, _react.useMemo)(function () {
-    return [{
-      component: 'QueryFilter',
-      props: {
-        placeholder: 'placeholder'
-      },
-      children: schema
-    }, {
-      type: 'void',
-      decorator: null,
-      component: 'Submit',
-      props: {
-        style: _objectSpread({}, triggerType === 'submit' ? {} : {
-          display: 'none'
-        })
-      }
-    }];
-  }, []);
-  var eventProps = getEventProps(triggerType, onFilter);
-  return /*#__PURE__*/_react.default.createElement(_ProForm.default, _objectSpread(_objectSpread(_objectSpread({
-    feedbackLayout: "none",
-    breakpoints: [],
-    bordered: false
-  }, otherProps), eventProps), {}, {
-    className: (0, _classnames.default)(prefixCls, props.className),
-    schema: querySchema
-  }));
-});
 /**
  * 高级筛选
  */
 
-exports.QueryFilter = QueryFilter;
 var AdvancedFilter = /*#__PURE__*/(0, _react.memo)(function (props) {
   var form = (0, _react.useMemo)(function () {
     return (props === null || props === void 0 ? void 0 : props.form) || (0, _core.createForm)();

package/lib/form/Filter/index.scss

@@ -0,0 +1,71 @@
+@import '../global.scss';
+
+$query-filter: #{$teamix-pro-form}-query-filter;
+
+.#{$query-filter} {
+  .#{$query-filter}-inline {
+    display: flex;
+    justify-content: space-between;
+  }
+  .#{$query-filter}-left {
+    display: flex;
+  }
+  .#{$query-filter}-addonBefore {
+    flex: 0 1 auto;
+    margin-right: 8px;
+  }
+  .#{$query-filter}-simple {
+    flex: 0 0 auto;
+    margin-right: -8px;
+    margin-bottom: 8px;
+  }
+  .#{$query-filter}-toggle {
+    margin-bottom: 8px;
+  }
+  .#{$query-filter}-addonAfter {
+    flex: 0 1 auto;
+    margin-left: 8px;
+  }
+  .#{$query-filter}-tag-title {
+    margin-right: 12px;
+    color: var(--color-text1-8, #848484);
+  }
+  .#{$query-filter}-tag-content {
+    color: var(--color-text1-2, #5a5a5a);
+    font-weight: bold;
+  }
+  .#{$query-filter}-tag-hidden {
+    display: none;
+  }
+  .#{$query-filter}-advanced {
+    padding: 16px;
+    background-color: var(--color-fill1-2, #f7f7f7);
+  }
+  .#{$query-filter}-advanced-hidden {
+    display: none;
+  }
+}
+
+// 筛选
+.#{$teamix-pro-form}-filter-advanced,
+.#{$teamix-pro-form}-filter-simple {
+  .#{$form-item-cls}-feedback-layout-popover {
+    margin-bottom: 0;
+  }
+  .#{$css-prefix}date-picker2-input {
+    .#{$css-prefix}input {
+      width: inherit;
+      input {
+        width: inherit;
+      }
+    }
+  }
+}
+
+// 筛选和抽屉按钮
+.#{$teamix-pro-form}-filter-advanced,
+.#{$css-prefix}drawer-footer {
+  .#{$css-prefix}formily-button-group {
+    margin-top: 0;
+  }
+}

package/lib/form/Filter/index2.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import type { QueryFilterProps } from '../typing';
+import './index.scss';
+/**
+ * 查询筛选
+ */
+declare const QueryFilter: React.FC<QueryFilterProps>;
+export { QueryFilter };