@teamix/pro 1.2.23 → 1.2.28

package/dist/pro.min.js.LICENSE.txt

@@ -24,6 +24,8 @@ object-assign
 * (c) Sindre Sorhus; MIT License
 */
 
+/*! js-cookie v3.0.1 | MIT */
+
 /** @license React v16.13.1
  * react-is.production.min.js
  *

package/es/actions/dialog.js

@@ -1,4 +1,4 @@
-var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
+var _excluded = ["trigger", "url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
     _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "popType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent", "message", "footerDescription", "footerAlign", "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; }
@@ -81,7 +81,8 @@ export function useDialogAction(action, actionContext) {
   var onActionStart = function onActionStart(context, e) {
     var _objectSpread2;
 
-    var url = action.url,
+    var trigger = action.trigger,
+        url = action.url,
         method = action.method,
         params = action.params,
         data = action.data,
@@ -228,7 +229,7 @@ export function useDialogAction(action, actionContext) {
     })), _objectSpread2), containerProps), containerOtherProps);
 
     var ret = container.show(quickShowProps);
-    store.hide = ret.hide;
+    store.hide = ret ? ret.hide || ret.close : function () {};
   };
 
   return _objectSpread({}, eventHandler(action, actionContext, onActionStart));

package/es/actions/index.d.ts

@@ -26,25 +26,28 @@ export declare type ProActionConfig = ({
 } & LinkAction);
 export declare function registerActionHandler(id: string, extendActionId: string, defaultConfig: any): void;
 export declare function useAction(config?: ProActionConfig, context?: any): any;
-export interface ProActionButtonProps extends ButtonProps {
-    key?: string | number;
+export interface ProActionButtonProps extends ProActionCommonProps, ButtonProps {
     config?: ProActionConfig;
-    visible?: any;
     disabled?: any;
     icon?: string;
-    context?: any;
     onClick?: (event: React.MouseEvent<Element, MouseEvent>, context?: any) => void;
 }
 export declare const ProActionButton: (props: ProActionButtonProps) => JSX.Element;
-export interface ProActionMenuButtonProps extends MenuButtonProps {
+export interface ProActionCommonProps {
     key?: string | number;
-    actions: ProActionProps[];
     visible?: any;
-    icon?: string;
     context?: any;
 }
+export interface ProActionMenuButtonProps extends ProActionCommonProps, Omit<MenuButtonProps, 'visible'> {
+    actions: ProActionProps[];
+    icon?: string;
+    noArrow?: boolean;
+}
 export declare const ProActionMenuButton: (props: ProActionMenuButtonProps) => JSX.Element;
-export declare type ProActionProps = ProActionButtonProps | ProActionMenuButtonProps;
+export interface ProActionDividerProps extends ProActionCommonProps {
+    type: 'divider';
+}
+export declare type ProActionProps = ProActionButtonProps | ProActionMenuButtonProps | ProActionDividerProps;
 export declare type ProActionGroupProps = {
     /** 操作组类型：按钮、文字按钮 */
     type?: 'button' | 'text';
@@ -59,7 +62,7 @@ export declare type ProActionGroupProps = {
      */
     moreText?: string;
     /** 更多按钮的配置，只有在actions数量超过max时才有效 */
-    more?: string | ProActionButtonProps;
+    more?: string | Omit<ProActionMenuButtonProps, 'actions'>;
     /** 是否有分割线，只有type="text"时生效，默认有分割线 */
     divider?: boolean;
 } & React.HTMLAttributes<HTMLElement>;

package/es/actions/index.js

@@ -1,7 +1,7 @@
 var _excluded = ["type"],
     _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "onClick"],
     _excluded3 = ["loading"],
-    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
+    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
     _excluded5 = ["context", "text"],
     _excluded6 = ["key", "actions"],
     _excluded7 = ["key", "config"],
@@ -209,6 +209,12 @@ var ProActionMenuButtonItem = function ProActionMenuButtonItem(props) {
 };
 
 function renderCommonActionButtonMenuItem(action, key, context) {
+  if (action.type === 'divider') {
+    return /*#__PURE__*/React.createElement(Menu.Divider, {
+      key: key
+    });
+  }
+
   var menuBtn = action;
 
   if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
@@ -236,6 +242,8 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
       context = props.context,
       _props$type2 = props.type,
       type = _props$type2 === void 0 ? 'primary' : _props$type2,
+      className = props.className,
+      noArrow = props.noArrow,
       others = _objectWithoutProperties(props, _excluded4);
 
   return /*#__PURE__*/React.createElement(MenuButton, _objectSpread({
@@ -249,28 +257,52 @@ export var ProActionMenuButton = function ProActionMenuButton(props) {
       v2: true
     },
     type: type,
-    label: buttonContent(label || children, icon, iconSize, context)
+    label: buttonContent(label || children, icon, iconSize, context),
+    className: cls(className, {
+      'teamix-pro-actions-text-menu-btn-no-arrow': noArrow
+    })
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
-}; // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
+}; // 超出 max，则折叠起来
 
-function formatGroupActions(actions, max, moreConfig) {
-  var MAX = max < 1 ? MAX_ACTTIONS : max;
-
-  if (actions.length <= MAX) {
+function foldExtraActions(actions, max, moreConfig) {
+  if (actions.length <= max) {
     return actions;
   }
 
-  return [].concat(_toConsumableArray(actions.slice(0, MAX - 1)), [_objectSpread(_objectSpread({
+  return [].concat(_toConsumableArray(actions.slice(0, max - 1)), [_objectSpread(_objectSpread({
     key: '__teamix_pro_action_group_more_btn'
   }, moreConfig), {}, {
-    actions: actions.slice(MAX - 1)
+    actions: actions.slice(max - 1)
   })]);
+} // 如果 actions 数量超过了 max，则把第 max 个和剩余超出部分折叠起来成为一个 menu
+// divider 不计数
+
+
+function formatGroupActions(actions, max, moreConfig) {
+  var MAX = max < 1 ? MAX_ACTTIONS : max;
+  var count = 0;
+  var index = 0;
+
+  for (; index < actions.length && count < MAX; index++) {
+    if (actions[index].type !== 'divider') {
+      count += 1;
+    }
+  }
+
+  return foldExtraActions(actions, Math.max(index, MAX), moreConfig);
 } // 渲染一个 button 或者 menu button
 
 
 function renderCommonActionButton(button, context, isTypeText) {
+  if (button.type === 'divider') {
+    return /*#__PURE__*/React.createElement(Divider, {
+      key: button.key,
+      direction: "ver"
+    });
+  }
+
   var buttonContext = button.context,
       text = button.text,
       others = _objectWithoutProperties(button, _excluded5);
@@ -288,18 +320,27 @@ function renderCommonActionButton(button, context, isTypeText) {
 }
 
 function getDefaultMoreButton(type, more) {
-  var moreConfig = typeof more === 'string' ? {
-    children: more
-  } : more;
   var defaultConfig = type === 'button' ? {
     children: getMessage('more')
   } : {
     icon: 'more-line',
-    // iconSize: 'small',
     autoWidth: false,
-    className: 'teamix-pro-actions-text-menu-btn-no-arrow'
+    noArrow: true
   };
-  return Object.assign(defaultConfig, moreConfig);
+
+  if (!more) {
+    return defaultConfig;
+  }
+
+  var moreConfig = typeof more === 'string' ? {
+    children: more
+  } : more;
+
+  if (type === 'button') {
+    return Object.assign(defaultConfig, moreConfig);
+  }
+
+  return moreConfig;
 }
 
 var MAX_ACTTIONS = 4;

package/es/actions/index.scss

@@ -2,12 +2,23 @@
   display: flex;
   align-items: center;
   flex-wrap: wrap;
+
+  & > .next-divider {
+    & + .next-divider {
+      display: none;
+    }
+  }
+
   &.teamix-pro-actions-type-button {
     & > button {
       &:not(:last-child) {
         margin-right: var(--s-2);
       }
     }
+    & > .next-divider {
+      margin-left: 0;
+      margin-right: var(--s-2);
+    }
   }
 
   &.teamix-pro-actions-type-text:not(.teamix-pro-actions-divider) {
@@ -109,4 +120,4 @@
       }
     }
   }
-}
+}

package/es/form/Filter/AdvancedFilter.js

@@ -53,7 +53,7 @@ var AdvancedFilter = /*#__PURE__*/memo(function (props) {
       props: {
         breakpoints: [480, 720, 990, 1200, Infinity],
         maxColumns: [1, 2, 3, 3, 4],
-        maxWidth: [480, 360, 330, 330, 300],
+        maxWidth: [480, 360, 330, 400],
         columnGap: 16,
         rowGap: 12
       },

package/es/form/Filter/Layout.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+import type { QueryFilterLayoutProps } from '../typing';
+import './layout.scss';
+declare const QueryFilterLayout: React.FC<QueryFilterLayoutProps>;
+export { QueryFilterLayout };

package/es/form/Filter/Layout.js

@@ -0,0 +1,82 @@
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import React, { useCallback, useState } from 'react';
+import cls from 'classnames';
+import { Button, Badge } from '@alicloudfe/components';
+import TeamixIcon from '@teamix/icon';
+import { usePrefixCls, getMessage, isValid } from '@teamix/utils';
+import './layout.scss';
+
+var QueryFilterLayout = function QueryFilterLayout(_ref) {
+  var className = _ref.className,
+      addonBefore = _ref.addonBefore,
+      addonAfter = _ref.addonAfter,
+      inlineContent = _ref.inlineContent,
+      panelContent = _ref.panelContent,
+      count = _ref.count,
+      expand = _ref.expand,
+      onExpand = _ref.onExpand,
+      children = _ref.children;
+  var prefixCls = usePrefixCls('', {
+    prefix: 'teamix-pro-form-query-filter-layout'
+  });
+
+  var _useState = useState(!!expand),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var onClick = useCallback(function () {
+    setVisible(!visible);
+    onExpand === null || onExpand === void 0 ? void 0 : onExpand(!visible);
+  }, [visible]);
+  return /*#__PURE__*/React.createElement("div", {
+    className: cls(prefixCls, className)
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-inline")
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-left")
+  }, addonBefore ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-addonBefore")
+  }, addonBefore) : null, inlineContent, isValid(panelContent) ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-toggle")
+  }, /*#__PURE__*/React.createElement(Badge, {
+    count: count,
+    style: _objectSpread({
+      backgroundColor: 'var(--color-brand1-6, #0064c8)',
+      color: 'var(--color-white, #fff)'
+    }, visible ? {
+      display: 'none'
+    } : {})
+  }, /*#__PURE__*/React.createElement(Button, {
+    onClick: onClick
+  }, visible ? /*#__PURE__*/React.createElement(TeamixIcon, {
+    type: "up-line"
+  }) : /*#__PURE__*/React.createElement(TeamixIcon, {
+    type: "filter-line"
+  }), getMessage('advancedFilter')))) : null), addonAfter ? /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-addonAfter")
+  }, addonAfter) : null), /*#__PURE__*/React.createElement("div", {
+    className: cls("".concat(prefixCls, "-panel"), visible && isValid(panelContent) ? '' : "".concat(prefixCls, "-panel-hidden"))
+  }, panelContent), /*#__PURE__*/React.createElement("div", {
+    className: "".concat(prefixCls, "-children")
+  }, children));
+};
+
+export { QueryFilterLayout };

package/es/form/Filter/SimpleFilter.js

@@ -10,14 +10,16 @@ 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; }
 
-import React, { memo, useMemo } from 'react';
+import React, { memo, useCallback, useMemo, useRef } from 'react';
 import cls from 'classnames';
 import { usePrefixCls } from '@teamix/utils';
-import ProForm from '../ProForm';
+import ProForm from '../ProForm'; // 初始化Search组件，内置部分属性
 
 var initializeSearch = function initializeSearch(schema) {
-  return schema.map(function (item) {
+  var searchName;
+  var initializedSchema = schema.map(function (item) {
     if (item.component === 'Search') {
+      searchName = item.name;
       return _objectSpread(_objectSpread({}, item), {}, {
         decoratorProps: _objectSpread(_objectSpread({}, item.decoratorProps), {}, {
           inset: false
@@ -30,6 +32,10 @@ var initializeSearch = function initializeSearch(schema) {
 
     return item;
   });
+  return {
+    searchName: searchName,
+    initializedSchema: initializedSchema
+  };
 };
 /**
  * 简单筛选
@@ -37,6 +43,8 @@ var initializeSearch = function initializeSearch(schema) {
 
 
 var SimpleFilter = /*#__PURE__*/memo(function (props) {
+  var searchValue = useRef(undefined);
+
   var schema = props.schema,
       onChange = props.onChange,
       onSubmit = props.onSubmit,
@@ -45,13 +53,18 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
   var prefixCls = usePrefixCls('', {
     prefix: 'teamix-pro-form-query-filter-simple'
   });
+
+  var _initializeSearch = initializeSearch(schema),
+      searchName = _initializeSearch.searchName,
+      initializedSchema = _initializeSearch.initializedSchema;
+
   var simpleSchema = useMemo(function () {
     return [{
       component: 'FormFlex',
       props: {
         size: 8
       },
-      children: initializeSearch(schema)
+      children: initializedSchema
     }, {
       component: 'Submit',
       props: {
@@ -60,7 +73,18 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
         }
       }
     }];
-  }, [schema]);
+  }, [initializedSchema]);
+  var onInnerChange = useCallback(function (values, value, name) {
+    // 处理Search组件，Select切换时不触发onChange
+    if (searchName === name) {
+      if (searchValue.current !== value[1]) {
+        onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
+        searchValue.current = value[1];
+      }
+    } else {
+      onChange === null || onChange === void 0 ? void 0 : onChange(values, name, value);
+    }
+  }, [searchName, searchValue.current]);
   return /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({}, otherProps), {}, {
     className: cls(prefixCls, props.className),
     schema: simpleSchema,
@@ -68,7 +92,7 @@ var SimpleFilter = /*#__PURE__*/memo(function (props) {
     breakpoints: [],
     inset: true,
     onSubmit: onSubmit,
-    onChange: onChange
+    onChange: onInnerChange
   }));
 });
 export default SimpleFilter;

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

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