@teamix/pro 1.1.29 → 1.1.33

package/es/actions/dialog-form.js

@@ -23,6 +23,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState, useRef, useEffect } from 'react';
+import { useHistory } from 'react-router-dom';
 import { Loading } from '@alicloudfe/components';
 import ProForm, { createForm } from '../form';
 import { getTargetValue } from '@teamix/utils';
@@ -79,12 +80,13 @@ var DialogForm = function DialogForm(props) {
       loading = _useState2[0],
       setLoading = _useState2[1];
 
+  var history = useHistory();
   useEffect(function () {
     formRef.current = form;
 
     if (initialRequest) {
       setLoading(true);
-      doRequest(initialRequest, context).then(function (res) {
+      doRequest(initialRequest, context, history).then(function (res) {
         form.setValues(res);
         setLoading(false);
       }).catch(function () {

package/es/actions/dialog.d.ts

@@ -1,14 +1,12 @@
 import React from 'react';
 import { QuickShowConfig } from '@alicloudfe/components/types/dialog';
 import { quickShowDrawerProps } from '@alicloudfe/components/types/drawer';
-import { LinkBase } from './link';
 import { RequestAction } from './request';
 export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShowConfig, 'onError' | 'type'>, Omit<quickShowDrawerProps, 'trigger' | 'animation' | 'height' | 'locale' | 'onOk' | 'onCancel' | 'onError'> {
     url?: string;
     dialogType?: 'dialog' | 'drawer';
     dialogQuickShowType?: 'alert' | 'confirm';
     messageType?: 'success' | 'warning' | 'error' | 'notice' | 'help' | 'loading';
-    link?: LinkBase;
 }
 export declare function useDialogAction(action: DialogAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;

package/es/actions/dialog.js

@@ -30,9 +30,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Dialog, Drawer } from '@alicloudfe/components';
-import { getTargetValue, uuid } from '@teamix/utils';
+import { getTargetValue, uuid, goToLink } from '@teamix/utils';
 import { eventHandler } from './base';
-import { goToLink } from './link';
 import { doRequest } from './request';
 
 function addContextForReactNode(content, context) {
@@ -95,50 +94,44 @@ export function useDialogAction(action, context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  if (!link) {
+                  if (url) {
                     _context.next = 5;
                     break;
                   }
 
-                  goToLink(link, history);
-                  onFinish && onFinish();
-                  resolve(true);
-                  return _context.abrupt("return");
-
-                case 5:
-                  if (url) {
-                    _context.next = 9;
-                    break;
+                  if (link) {
+                    goToLink(link, history);
                   }
 
                   onFinish && onFinish();
                   resolve(true);
                   return _context.abrupt("return");
 
-                case 9:
+                case 5:
                   setLoading(true);
-                  _context.prev = 10;
-                  _context.next = 13;
-                  return doRequest(action, context);
+                  _context.prev = 6;
+                  _context.next = 9;
+                  return doRequest(action, context, history);
 
-                case 13:
+                case 9:
                   onFinish && onFinish();
                   resolve(true);
-                  _context.next = 21;
+                  _context.next = 18;
                   break;
 
-                case 17:
-                  _context.prev = 17;
-                  _context.t0 = _context["catch"](10);
+                case 13:
+                  _context.prev = 13;
+                  _context.t0 = _context["catch"](6);
                   setLoading(false);
                   resolve(false);
+                  return _context.abrupt("return");
 
-                case 21:
+                case 18:
                 case "end":
                   return _context.stop();
               }
             }
-          }, _callee, null, [[10, 17]]);
+          }, _callee, null, [[6, 13]]);
         }));
 
         return function (_x) {

package/es/actions/index.js

@@ -33,7 +33,7 @@ import React from 'react';
 import cls from 'classnames';
 import { Button, MenuButton, Menu, Divider } from '@alicloudfe/components';
 import Icon from '@teamix/icon';
-import { getTargetValue } from '@teamix/utils';
+import { getTargetValue, getMessage } from '@teamix/utils';
 import { useLinkAction } from './link';
 import { useRequestAction } from './request';
 import { useDialogAction } from './dialog';
@@ -121,16 +121,18 @@ export var useAction = function useAction(config, context) {
   }, registedAction.defaultConfig), others), context);
 };
 
-var buttonContent = function buttonContent(content, iconType, iconSize) {
+var buttonContent = function buttonContent(content, iconType, iconSize, context) {
+  var renderedContent = typeof content === 'function' ? content(context) : content;
+
   if (!iconType) {
-    return content;
+    return renderedContent;
   }
 
   return [/*#__PURE__*/React.createElement(Icon, {
     type: iconType,
     size: iconSize,
     key: "teamix-button-icon"
-  }), content];
+  }), renderedContent];
 };
 
 export var ActionButton = function ActionButton(props) {
@@ -154,7 +156,7 @@ export var ActionButton = function ActionButton(props) {
   }) : _objectSpread(_objectSpread({}, actionProps), others);
   return /*#__PURE__*/React.createElement(Button, _objectSpread({
     type: type
-  }, buttonProps), buttonContent(children, icon, iconSize));
+  }, buttonProps), buttonContent(children, icon, iconSize, context));
 };
 
 function renderMenuButtonItem(item, key, context) {
@@ -173,7 +175,7 @@ function renderMenuButtonItem(item, key, context) {
   }) : _objectSpread({}, menuItemProps);
   return /*#__PURE__*/React.createElement(MenuButton.Item, _objectSpread({
     key: key
-  }, buttonProps), buttonContent(item.children, item.icon));
+  }, buttonProps), buttonContent(item.children, item.icon, undefined, context));
 }
 
 function renderCommonActionButtonMenuItem(action, key, context) {
@@ -209,8 +211,11 @@ export var ActionMenuButton = function ActionMenuButton(props) {
       mode: 'popup',
       triggerType: 'hover'
     },
+    popupProps: {
+      shouldUpdatePosition: true
+    },
     type: type,
-    label: buttonContent(label || children, icon, iconSize)
+    label: buttonContent(label || children, icon, iconSize, context)
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, i, context);
   }));
@@ -255,7 +260,7 @@ function renderCommonActionButton(button, context, isTypeText) {
 function getDefaultMoreButton(type, moreText) {
   if (type === 'button') {
     return {
-      label: moreText || '更多'
+      label: moreText || getMessage('more')
     };
   }
 

package/es/actions/link.d.ts

@@ -1,13 +1,7 @@
+import { LocationHistory } from '@teamix/utils';
 import { BaseAction } from './base';
-export interface LinkBase {
-    to: string;
-    search?: string;
-    hash?: string;
-    blank?: boolean;
+export interface LinkAction extends BaseAction, LocationHistory {
 }
-export interface LinkAction extends BaseAction, LinkBase {
-}
-export declare function goToLink(link: LinkBase, history: any): void;
 export declare function useLinkAction(action: LinkAction, context?: any): {
     [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
 };

package/es/actions/link.js

@@ -4,29 +4,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; }
 
-import { useHistory } from 'react-router-dom';
-import { getTargetValue } from '@teamix/utils';
+import { getTargetValue, goToLink } from '@teamix/utils';
 import { eventHandler } from './base';
-export function goToLink(link, history) {
-  var to = link.to,
-      search = link.search,
-      hash = link.hash,
-      blank = link.blank;
-
-  if (blank) {
-    window.open("".concat(to).concat(search ? "?".concat(search) : '').concat(hash ? "#".concat(hash) : ''));
-    return;
-  }
-
-  history.push({
-    pathname: to,
-    search: search,
-    hash: hash
-  });
-}
 export function useLinkAction(action, context) {
-  var history = useHistory();
-
   var _getTargetValue = getTargetValue(action, context),
       to = _getTargetValue.to,
       search = _getTargetValue.search,
@@ -39,7 +19,7 @@ export function useLinkAction(action, context) {
       search: search,
       hash: hash,
       blank: blank
-    }, history);
+    });
   }));
 }
 export default useLinkAction;

package/es/actions/request.d.ts

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

package/es/actions/request.js

@@ -24,17 +24,18 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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; }
 
 import { useState } from 'react';
+import { useHistory } from 'react-router-dom';
 import { doCommonRequest } from '@teamix/utils';
 import { eventHandler } from './base'; // action 里的数据请求都默认是 post 类型
 
-export function doRequest(action, context) {
+export function doRequest(action, context, history) {
   var _action$method = action.method,
       method = _action$method === void 0 ? 'post' : _action$method,
       others = _objectWithoutProperties(action, _excluded);
 
   return doCommonRequest(_objectSpread({
     method: method
-  }, others), context);
+  }, others), context, history);
 }
 export function useRequestAction(action, context) {
   var _useState = useState(false),
@@ -42,12 +43,14 @@ export function useRequestAction(action, context) {
       loading = _useState2[0],
       setLoading = _useState2[1];
 
+  var history = useHistory();
+
   var onFinish = action.onFinish,
       others = _objectWithoutProperties(action, _excluded2);
 
   return _objectSpread(_objectSpread({}, eventHandler(action, function () {
     setLoading(true);
-    doRequest(_objectSpread({}, others), context).then(function () {
+    doRequest(_objectSpread({}, others), context, history).then(function () {
       setLoading(false);
       onFinish && onFinish();
     }).catch(function () {

package/es/form/Components/FormGroup/index.scss

@@ -1,4 +1,4 @@
-@import '~@alifd/next/lib/core/index-noreset.scss';
+@import '../../global.scss';
 
 $formily-group: #{$css-prefix}formily-group;
 

package/es/form/Components/ProField/index.d.ts

@@ -143,6 +143,10 @@ declare const _default: React.ForwardRefExoticComponent<(Partial<import("@teamix
     type: "tagFilter";
 } & {
     children?: React.ReactNode;
+}> | Partial<import("@teamix/pro-field/lib/components/FieldTagFilter").IProFieldMultipleTagFilter & {
+    type: "multipleTagPicker";
+} & {
+    children?: React.ReactNode;
 }> | Partial<import("@teamix/pro-field/lib/components/FieldMenuSelect").IProFieldMenuSelect & {
     type: "menuSelect";
 } & {

package/es/form/Components/Query/index.scss

@@ -1,9 +1,4 @@
-@import '~@alifd/next/lib/core/index-noreset.scss';
-
-$form-item-cls: #{$css-prefix}formily-item;
-$noborder-font-weight-medium: calc(
-  var(--form-element-medium-height, 32px) - var(--input-border-width, 1px) * 2
-);
+@import '../../global.scss';
 
 // Query样式
 .#{$css-prefix}filter {

package/es/form/Components/Text/index.scss

@@ -1,6 +1,8 @@
-$teamix-pro-form: teamix-pro-form;
+@import '../../global.scss';
 
-.#{$teamix-pro-form}-text {
+$teamix-pro-form-text: #{$teamix-pro-form}-text;
+
+.#{$teamix-pro-form-text} {
   line-height: var(--form-element-medium-height, 32px);
   color: var(--color-fill1-6, #848484);
 }

package/es/form/ProForm/index.js

@@ -18,7 +18,7 @@ import { Form, FormLayout } from '@teamix/formily';
 import TeamixIcon from '@teamix/icon';
 import { usePrefixCls } from '@teamix/utils';
 import SchemaForm from '../SchemaForm';
-import { mergeArrayValue, getDisplayValues } from '../utils';
+import { mergeArrayValue } from '../utils';
 import useAutoSubmit from './useAutoSubmit';
 import useInitialRequest from './useInitialRequest';
 import './index.scss';
@@ -71,7 +71,7 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
     form.addEffects('onChange', function () {
       onFormValuesChange(function (form) {
         if (onChange) {
-          onChange(toJS(form.values), getDisplayValues(form, form.values));
+          onChange(toJS(form.values));
         }
       });
     });
@@ -85,20 +85,7 @@ var ProForm = /*#__PURE__*/memo(function (_ref) {
         form.setInitialValues(values);
       });
     }
-  }, []); // return (
-  //   <Form
-  //     className={cls(prefixCls, className)}
-  //     {...otherProps}
-  //     {...getTeamixLayout}
-  //     form={form}
-  //     onAutoSubmit={onAutoSubmit}
-  //     onAutoSubmitFailed={onSubmitFailed}
-  //   >
-  //     <SchemaForm schema={schema} scope={scope} components={components} />
-  //     {children}
-  //   </Form>
-  // );
-
+  }, []);
   return outerForm === false ?
   /*#__PURE__*/
   // 特殊表单，无需渲染form实例，例如FormDialog等

package/es/form/ProForm/index.scss

@@ -1,14 +1,11 @@
-@import '~@alifd/next/lib/core/index-noreset.scss';
-
-$form-item-cls: #{$css-prefix}formily-item;
-$teamix-pro-form: teamix-pro-form;
+@import '../global.scss';
 
 // FormItem 样式重写
 .#{$form-item-cls} {
   // 标签加粗 主题颜色
   .#{$form-item-cls}-label label {
     color: var(--form-label-color, #333333);
-    font-weight: $font-weight-medium;
+    font-weight: var(--font-weight-medium, 500);
   }
 
   // 溢出label样式
@@ -126,10 +123,6 @@ $teamix-pro-form: teamix-pro-form;
   }
 }
 
-// 内嵌模式
-$inset-font-weight-medium: calc(
-  var(--form-element-medium-height, 32px) - var(--input-border-width, 1px) * 2
-);
 // 内嵌模式 - 行高
 .#{$form-item-cls}-inset {
   line-height: $inset-font-weight-medium;
@@ -155,7 +148,7 @@ $inset-font-weight-medium: calc(
     .#{$form-item-cls}-label-content {
       label {
         color: var(--color-text1-8, #848484);
-        font-weight: $font-weight-2;
+        font-weight: normal;
       }
     }
     .#{$form-item-cls}-colon {
@@ -193,7 +186,7 @@ $inset-font-weight-medium: calc(
 
 // Editable预览态行高
 .#{$css-prefix}formily-editable-content {
-  line-height: $s-8;
+  line-height: var(--form-element-medium-height, 32px);
 }
 
 // 折叠面板

package/es/form/ProForm/useAutoSubmit.js

@@ -4,10 +4,12 @@ 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 { useHistory } from 'react-router-dom';
 import { doCommonRequest, isObj } from '@teamix/utils';
 
 var useAutoSubmit = function useAutoSubmit(onSubmit) {
   if (isObj(onSubmit)) {
+    var history = useHistory();
     var submitConfig = onSubmit;
     return function (values) {
       return doCommonRequest(_objectSpread(_objectSpread({
@@ -16,7 +18,7 @@ var useAutoSubmit = function useAutoSubmit(onSubmit) {
         params: _objectSpread(_objectSpread({}, values), submitConfig.params || {})
       }), {
         fields: values
-      });
+      }, history);
     };
   }
 

package/es/form/ProForm/useFormDisplayValues.d.ts

@@ -0,0 +1,6 @@
+/**
+ * 获取表单值的可显示值
+ * @returns 如果某字段有dataSource，则返回value对应label
+ */
+declare const useFormDisplayValues: () => any;
+export default useFormDisplayValues;

package/es/form/ProForm/useFormDisplayValues.js

@@ -0,0 +1,65 @@
+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 { useForm } from '@formily/react';
+import { isArr, isPlainObj, getValueByValue } from '@teamix/utils';
+/**
+ * 获取表单值的可显示值
+ * @returns 如果某字段有dataSource，则返回value对应label
+ */
+
+var useFormDisplayValues = function useFormDisplayValues() {
+  var form = useForm();
+  var values = form.values; // 判断值的类型，递归获取每个值在该结构中的完整路径
+
+  var getDisplayValues = function getDisplayValues(values) {
+    var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+    var displayValues;
+
+    if (isPlainObj(values)) {
+      displayValues = {};
+      Object.entries(values).forEach(function (_ref) {
+        var _ref2 = _slicedToArray(_ref, 2),
+            key = _ref2[0],
+            value = _ref2[1];
+
+        var path = prefix ? "".concat(prefix, ".").concat(key) : "".concat(key);
+        displayValues[key] = getDisplayValues(value, path);
+      });
+    } else if (isArr(values)) {
+      displayValues = [];
+      values.map(function (value, index) {
+        var path = prefix ? "".concat(prefix, ".").concat(index) : "".concat(index);
+        displayValues[index] = getDisplayValues(value, path);
+      });
+    } else {
+      // 通过值的完整路径获取字段address（从form实例的indexes中），然后获取该字段的value在该字段dataSource中对应的label
+      var address = form.indexes[prefix];
+      var field = form.query(address).take();
+      displayValues = getValueByValue(field === null || field === void 0 ? void 0 : field.dataSource, values) || values;
+    }
+
+    return displayValues;
+  }; // 测试样例
+  // const example = {
+  //   a: [
+  //     [{ b: 'a.0.0.b', c: 'a.0.0.c' }, { d: 'a.0.1.d' }],
+  //     { e: [{ f: { g: [{ h: 'a.1.e.0.f.g.0.h' }] } }, 'a.1.e.1'] },
+  //   ],
+  // };
+  // console.log(getDisplayValues(example));
+
+
+  return getDisplayValues(values);
+};
+
+export default useFormDisplayValues;

package/es/form/SchemaForm/adapterType.js

@@ -41,7 +41,8 @@ var typeMap = (_typeMap = {
   ColorRadio: 'string',
   IconPicker: 'string',
   JsonInput: 'object',
-  TagPicker: 'array',
+  TagPicker: 'string',
+  MultipleTagPicker: 'array',
   Range: 'string',
   Search: 'array',
   ArrayCollapse: 'array',

package/es/form/SchemaForm/index.js

@@ -44,6 +44,7 @@ import adapterType from './adapterType';
 import adapterComponent from './adapterComponent';
 import adapterDecorator from './adapterDecorator';
 import initializeRequest from './initializeRequest';
+import initializeReactions from './initializeReactions';
 import initializeDataSource from './initializeDataSource';
 import initializeRules from './initializeRules';
 import initializeProField, { proFieldTypeMap } from './initializeProField';
@@ -57,7 +58,7 @@ import initializeFormStep from './initializeFormStep';
 import initializeFormTab from './initializeFormTab';
 import initializeFormCollapse from './initializeFormCollapse';
 import initializeArrayIcon from './initializeArrayIcon';
-import { getRandomName, mergeArrayValue, mapSchemaName } from '../utils';
+import { getRandomName, mapSchemaName } from '../utils';
 import warning from '../warning';
 export default /*#__PURE__*/memo(function (_ref) {
   var schema = _ref.schema,
@@ -211,21 +212,10 @@ export default /*#__PURE__*/memo(function (_ref) {
 
       var _initializeRules = initializeRules(rules),
           defaultRules = _initializeRules.rules,
-          rulesScope = _initializeRules.scope; // 合并reactions
+          rulesScope = _initializeRules.scope; // 合并reactions，初始化reactions
 
 
-      var mergedReactions = function () {
-        var innerReactions = [].concat(_toConsumableArray(requestReactions), _toConsumableArray(dataSourceReactions));
-
-        if (reactions && innerReactions.length) {
-          return mergeArrayValue(innerReactions, reactions);
-        } else if (innerReactions.length) {
-          return innerReactions;
-        }
-
-        return reactions;
-      }(); // 合并scope
-
+      var defaultReactions = initializeReactions(reactions, [].concat(_toConsumableArray(requestReactions), _toConsumableArray(dataSourceReactions))); // 合并scope
 
       Object.entries(_objectSpread(_objectSpread(_objectSpread({}, requestScope), dataSourceScope), rulesScope)).map(function (_ref2) {
         var _ref3 = _slicedToArray(_ref2, 2),
@@ -240,7 +230,7 @@ export default /*#__PURE__*/memo(function (_ref) {
         decorator: defaultDecorator,
         decoratorProps: defaultDecoratorProps,
         rules: defaultRules,
-        reactions: mergedReactions,
+        reactions: defaultReactions,
         dataSource: defaultDataSource
       })); // 递归子组件
 

package/es/form/SchemaForm/initializeProField.js

@@ -46,6 +46,7 @@ var proFieldTypeMap = {
   IconPicker: 'icon',
   JsonInput: 'json',
   TagPicker: 'tagPicker',
+  MultipleTagPicker: 'multipleTagPicker',
   Range: 'range',
   Search: 'search' // Upload: 'upload',
 

package/es/form/SchemaForm/initializeReactions.d.ts

@@ -0,0 +1,2 @@
+declare const initializeReactions: (reactions: any, innerReactions: any) => any;
+export default initializeReactions;