@teamix/pro 1.3.1 → 1.3.4

package/es/form/SchemaForm/initializeSelectTable.js

@@ -0,0 +1,38 @@
+var _excluded = ["name", "title", "children"];
+
+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 initializeTableColumn = function initializeTableColumn(item) {
+  var name = item.name,
+      title = item.title,
+      children = item.children,
+      otherProps = _objectWithoutProperties(item, _excluded);
+
+  return {
+    name: name,
+    title: title,
+    component: 'SelectTable.Column',
+    children: children,
+    props: _objectSpread({}, otherProps)
+  };
+};
+
+var initialize = function initialize(item) {
+  var _item$children = item.children,
+      children = _item$children === void 0 ? [] : _item$children;
+  return _objectSpread(_objectSpread({}, item), {}, {
+    children: children.map(function (item) {
+      return initializeTableColumn(item);
+    })
+  });
+};
+
+export default initialize;

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

@@ -1,6 +1,6 @@
 import type { ProFormRequestConfig } from '../typing';
-declare const $request: (field: any, requestConfig: ProFormRequestConfig, context: any, type: 'request' | 'validator' | 'dataSource') => Promise<unknown>;
+declare const $request: (field: any, { extraConfig, ...requestConfig }: ProFormRequestConfig, context: any, type: 'request' | 'validator' | 'dataSource') => Promise<unknown>;
 declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
 declare const $validator: (services: any, requestConfig: ProFormRequestConfig, context: any) => (value: any, rules: any, { field }: any) => any;
-declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any, readPretty: any) => (field: any) => any;
+declare const $dataSource: (services: any, requestConfig: ProFormRequestConfig, context: any) => (field: any) => any;
 export { $request, $common, $dataSource, $validator };

package/es/form/SchemaForm/reactions.js

@@ -1,29 +1,43 @@
+var _excluded = ["extraConfig"];
+
 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; }
+
 import { isFn, isPureObj, doCommonRequest, getValueByValue } from '@teamix/utils'; // 配置请求
 
-var $request = function $request(field, requestConfig, context, type) {
+var $request = function $request(field, _ref, context, type) {
   var _field$data;
 
-  var beforeRequest = requestConfig.beforeRequest,
+  var extraConfig = _ref.extraConfig,
+      requestConfig = _objectWithoutProperties(_ref, _excluded);
+
+  var params = requestConfig.params,
+      beforeRequest = requestConfig.beforeRequest,
+      formatResult = requestConfig.formatResult,
       onSuccess = requestConfig.onSuccess;
   var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field, context) : {};
   /**
-   * // 主动触发的请求刷新
+   * 主动触发的请求刷新
    */
   // 触发所有配置的请求
 
   var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
   var refreshResult = isPureObj(refresh) ? refresh : {};
   return doCommonRequest(_objectSpread(_objectSpread({}, requestConfig), {}, {
-    params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
+    params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {
       return beforeRequestResult;
     },
+    formatResult: isFn(formatResult) ? function (res) {
+      return formatResult(res, field, context);
+    } : formatResult,
     onSuccess: isFn(onSuccess) ? function (res) {
       return onSuccess(res, field, context);
     } : onSuccess
@@ -34,57 +48,47 @@ var $request = function $request(field, requestConfig, context, type) {
 var $common = function $common(services, requestConfig, context) {
   return function (field) {
     return services(field, requestConfig, context, 'request').then(function (res) {
-      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
+      var _requestConfig$onComp;
+
+      return (_requestConfig$onComp = requestConfig.onComplete) === null || _requestConfig$onComp === void 0 ? void 0 : _requestConfig$onComp.call(requestConfig, res, field, context);
     });
   };
 }; // 配置校验
 
 
 var $validator = function $validator(services, requestConfig, context) {
-  return function (value, rules, _ref) {
-    var field = _ref.field;
+  return function (value, rules, _ref2) {
+    var field = _ref2.field;
     return services(field, requestConfig, context, 'validator').then(function (res) {
-      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
+      var _requestConfig$onComp2;
+
+      return (_requestConfig$onComp2 = requestConfig.onComplete) === null || _requestConfig$onComp2 === void 0 ? void 0 : _requestConfig$onComp2.call(requestConfig, res, field, context);
     });
   };
 }; // 配置DataSource
 
 
-var $dataSource = function $dataSource(services, requestConfig, context, readPretty) {
+var $dataSource = function $dataSource(services, requestConfig, context) {
   return function (field) {
-    if (!readPretty) {
-      field.setState({
-        loading: true,
-        readOnly: true
-      });
-    }
-
+    field.setState({
+      loading: true
+    });
     return services(field, requestConfig, context, 'dataSource').then(function (res) {
+      var _requestConfig$extraC, _requestConfig$onComp3;
+
       var isValueInDataSource = getValueByValue(res, field.value);
-      var clearValue = isValueInDataSource ? {} : {
+      var clearResult = !isValueInDataSource && (requestConfig === null || requestConfig === void 0 ? void 0 : (_requestConfig$extraC = requestConfig.extraConfig) === null || _requestConfig$extraC === void 0 ? void 0 : _requestConfig$extraC.clearInvalidValue) !== false ? {
         value: undefined
-      };
-
-      if (!readPretty) {
-        field.setState(_objectSpread({
-          dataSource: res,
-          loading: false,
-          readOnly: false
-        }, clearValue));
-      } else {
-        field.setState({
-          dataSource: res
-        });
-      }
-
-      return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
+      } : {};
+      field.setState(_objectSpread({
+        dataSource: res,
+        loading: false
+      }, clearResult));
+      return (_requestConfig$onComp3 = requestConfig.onComplete) === null || _requestConfig$onComp3 === void 0 ? void 0 : _requestConfig$onComp3.call(requestConfig, res, field, context);
     }).catch(function () {
-      if (!readPretty) {
-        field.setState({
-          loading: false,
-          readOnly: false
-        });
-      }
+      field.setState({
+        loading: false
+      });
     });
   };
 };

package/es/form/fieldTypeMap.d.ts

@@ -1,4 +1,7 @@
 declare const fieldTypeMap: {
     [x: string]: string;
 };
+declare const datePicker2TypeArray: string[];
+declare const timePicker2TypeArray: string[];
+export { datePicker2TypeArray, timePicker2TypeArray };
 export default fieldTypeMap;

package/es/form/fieldTypeMap.js

@@ -40,4 +40,7 @@ var fieldTypeMap = {
   Search: 'search',
   SelectGroup: 'selectGroup'
 };
+var datePicker2TypeArray = ['DatePicker', 'DateTimePicker', 'WeekPicker', 'MonthPicker', 'YearPicker', 'QuarterPicker', 'DateRangePicker', 'DateTimeRangePicker', 'WeekRangePicker', 'MonthRangePicker', 'YearRangePicker', 'QuarterRangePicker'];
+var timePicker2TypeArray = ['TimePicker', 'TimeRangePicker'];
+export { datePicker2TypeArray, timePicker2TypeArray };
 export default fieldTypeMap;

package/es/form/index.d.ts

@@ -31,6 +31,7 @@ declare const formilyReact: {
         displayName: string;
     };
     RecursionField: import("react").FC<originalFormilyReact.IRecursionFieldProps>;
+    ExpressionScope: import("react").FC<originalFormilyReact.IExpressionScopeProps>;
     createSchemaField<Components extends originalFormilyReact.SchemaReactComponents>(options?: originalFormilyReact.ISchemaFieldReactFactoryOptions<Components> | undefined): {
         <Decorator extends originalFormilyReact.JSXComponent, Component extends originalFormilyReact.JSXComponent>(props: originalFormilyReact.ISchemaFieldProps<Decorator, Component, import("@formily/core").ObjectField<Decorator, Component>>): JSX.Element;
         displayName: string;
@@ -90,7 +91,7 @@ declare const formilyReact: {
     }>>;
     connect<T_2 extends originalFormilyReact.JSXComponent>(target: T_2, ...args: originalFormilyReact.IComponentMapper<T_2>[]): import("react").ForwardRefExoticComponent<import("react").PropsWithoutRef<Partial<import("react").ComponentProps<T_2>>> & import("react").RefAttributes<unknown>>;
     observer: typeof originalFormilyReact.observer;
-    Observer: import("react").MemoExoticComponent<import("react").FunctionComponent<import("@formily/reactive-react").IObserverProps>>;
+    Observer: import("react").MemoExoticComponent<import("react").FunctionComponent<import("_@formily_reactive-react@2.0.11@@formily/reactive-react").IObserverProps>>;
     useForm: <T_3 extends object = any>() => import("@formily/core").Form<T_3>;
     useField: <T_4 = import("@formily/core").GeneralField>() => T_4;
     useParentForm: () => import("@formily/core").Form<any> | import("@formily/core").ObjectField<any, any>;

package/es/form/typing.d.ts

@@ -14,14 +14,16 @@ export interface ProFormInitializeItem {
  * ProForm 实例类型
  */
 export declare type ProFormType = FormType;
-declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search' | 'SelectGroup';
+declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search' | 'SelectGroup' | 'SelectTable' | 'SelectTable.Column';
 declare type IButtonComponent = 'Submit' | 'Reset';
 declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
 declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
 export interface ProFormRequestConfig extends CommonRequestConfig {
     beforeRequest?: (field?: any, context?: any) => any;
+    formatResult?: (res?: any, field?: any, context?: any) => any;
     onSuccess?: (res?: any, field?: any, context?: any) => any;
     onComplete?: (res?: any, field?: any, context?: any) => any;
+    extraConfig?: AnyObject;
 }
 export interface ProFormSchemaItem {
     type?: string;
@@ -72,6 +74,7 @@ export interface ProFormProps extends IFormLayoutProps {
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;
+    filterValues?: string[];
     activeFilterValueRef?: React.MutableRefObject<any>;
     forceClear?: boolean;
     onReset?: (payload?: any) => void;
@@ -106,6 +109,8 @@ export interface QueryFilterProps extends ProFormProps {
     addonAfter?: ReactNode;
     /** 顶部筛选区默认筛选项 */
     defaultFilterValue?: string;
+    /** 顶部筛选区筛选项配置 */
+    filterValues?: string[];
     /** 透出内部表单实例 */
     formRef?: React.MutableRefObject<any>;
     /** onChange事件的防抖时间 */

package/es/form/utils.js

@@ -55,6 +55,8 @@ var mapSize = function mapSize(props, field) {
 
 
 var mapStatus = function mapStatus(props, field) {
+  var _field$data;
+
   var takeStatus = function takeStatus() {
     var _field$warnings, _field$decoratorProps, _field$decoratorProps2;
 
@@ -72,9 +74,16 @@ var mapStatus = function mapStatus(props, field) {
     return state;
   };
 
-  return _objectSpread(_objectSpread({}, props), {}, {
-    state: takeState(props.state) || takeStatus()
-  });
+  var state = takeState(props.state) || takeStatus();
+  var result = {
+    state: state
+  }; // 当组件处于loading状态时，仅可读不可写。
+
+  if (state === 'loading' && ((_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.readOnlyOnLoading)) {
+    result.readOnly = true;
+  }
+
+  return _objectSpread(_objectSpread({}, props), result);
 };
 
 var patchDataSource = function patchDataSource() {
@@ -92,7 +101,7 @@ var patchDataSource = function patchDataSource() {
     return result;
   };
 
-  return dataSource.map(removeEmptyChildren);
+  return isArr(dataSource) ? dataSource.map(removeEmptyChildren) : [];
 };
 
 var mapDataSource = function mapDataSource(props, field) {

package/es/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.3.1";
+declare const version = "1.3.4";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };

package/es/index.js

@@ -30,7 +30,7 @@ export * from './table';
 export * from './utils'; // export * from './sidebar';
 
 export * from './timeline';
-var version = '1.3.1';
+var version = '1.3.4';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, // ProSidebar,
 ProTimeline, hooks, nocode, templates, utils };

package/es/info/components/baseInfo/index.scss

@@ -1,3 +1,6 @@
+$item-padding-bottom: -8px;
+// /** 消除 baseInfo 被其他组件包裹后没有居中的问题*/
 .teamix-pro-info {
   width: 100%;
+  margin-bottom: $item-padding-bottom;
 }

package/es/page-header/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ItemProps } from '@alicloudfe/components/types/breadcrumb';
-import { LinkPath, ProTagItem } from '@teamix/utils';
+import { LinkPath, ProTagItem, CapsuleTabType } from '@teamix/utils';
 import { ProActionGroupProps } from '../actions';
 import { ProInfoProps } from '../info';
 import './index.scss';
@@ -48,6 +48,8 @@ export declare type ProPageHeaderProps = {
     data?: ProPageHeaderDataItem[];
     /** 底部详情 */
     info?: ProInfoProps | React.ReactNode;
+    /** 切换 tabs */
+    tabs?: CapsuleTabType;
 } & Omit<React.HTMLAttributes<HTMLElement>, 'title'>;
 declare const ProPageHeader: React.FC<ProPageHeaderProps>;
 export default ProPageHeader;

package/es/page-header/index.js

@@ -1,6 +1,6 @@
 var _excluded = ["text", "children"],
     _excluded2 = ["color", "title", "num", "className"],
-    _excluded3 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style"];
+    _excluded3 = ["title", "description", "icon", "iconColor", "iconBackgroundType", "iconBackgroundColor", "goback", "operation", "extra", "image", "loading", "breadcrumb", "tags", "data", "info", "children", "className", "style", "tabs"];
 
 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; }
 
@@ -17,7 +17,7 @@ import { useHistory } from 'react-router-dom';
 import classnames from 'classnames';
 import TeamixIcon from '@teamix/icon';
 import { Breadcrumb } from '@alicloudfe/components';
-import { baseClass, goToLink, renderTags, isPresetColor, getColor, getColorClassName, getBackgroundColorClassName } from '@teamix/utils';
+import { baseClass, goToLink, renderTags, isPresetColor, getColor, getColorClassName, getBackgroundColorClassName, CapsuleTab } from '@teamix/utils';
 import { ProActionGroup } from '../actions';
 import { ProSkeletonRaw } from '../skeleton';
 import ProInfo from '../info';
@@ -123,6 +123,14 @@ var renderInfo = function renderInfo(info) {
   return info;
 };
 
+var renderTabs = function renderTabs(tabs) {
+  if (tabs) {
+    return /*#__PURE__*/React.createElement(CapsuleTab, _objectSpread({}, tabs));
+  }
+
+  return null;
+};
+
 var ProPageHeader = function ProPageHeader(props) {
   var title = props.title,
       description = props.description,
@@ -143,6 +151,7 @@ var ProPageHeader = function ProPageHeader(props) {
       children = props.children,
       className = props.className,
       style = props.style,
+      tabs = props.tabs,
       others = _objectWithoutProperties(props, _excluded3);
 
   var history = useHistory();
@@ -191,7 +200,7 @@ var ProPageHeader = function ProPageHeader(props) {
       size: "large"
     }) : /*#__PURE__*/React.createElement(React.Fragment, null, icon)), /*#__PURE__*/React.createElement("span", {
       className: cls('title-name')
-    }, title), renderTags(tags, 'large'));
+    }, title), renderTags(tags, 'large'), renderTabs(tabs !== null && tabs !== void 0 ? tabs : {}));
   };
 
   return /*#__PURE__*/React.createElement("header", _objectSpread({

package/es/table/components/ToolBar/DensityIcon.js

@@ -22,9 +22,11 @@ var RadioItem = Menu.RadioItem;
 var cls = baseClass('teamix-pro-table-toolbar-icon');
 
 var DensityIcon = function DensityIcon(props) {
+  var _actionRef$current;
+
   var actionRef = props.actionRef;
 
-  var _useState = useState('medium'),
+  var _useState = useState(((_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.size) || 'medium'),
       _useState2 = _slicedToArray(_useState, 2),
       size = _useState2[0],
       setSize = _useState2[1]; // const [fullscreen, setFullscreen] = useState<boolean>(false);
@@ -44,10 +46,10 @@ var DensityIcon = function DensityIcon(props) {
 
 
   var radioOnchange = function radioOnchange(mode) {
-    var _actionRef$current, _actionRef$current$se;
+    var _actionRef$current2, _actionRef$current2$s;
 
     setSize(mode);
-    (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : (_actionRef$current$se = _actionRef$current.setSize) === null || _actionRef$current$se === void 0 ? void 0 : _actionRef$current$se.call(_actionRef$current, mode);
+    (_actionRef$current2 = actionRef.current) === null || _actionRef$current2 === void 0 ? void 0 : (_actionRef$current2$s = _actionRef$current2.setSize) === null || _actionRef$current2$s === void 0 ? void 0 : _actionRef$current2$s.call(_actionRef$current2, mode);
   }; // // 销毁监听函数
   // useEffect(() => {
   //   return () => {

package/es/table/components/ToolBar/FilterColumnIcon.js

@@ -33,13 +33,22 @@ import { baseClass, getMessage } from '@teamix/utils';
 import React, { useState, useEffect } from 'react';
 import { cloneDeep, off, on } from '../../utils';
 import './index.scss';
-import { Ellipsis } from '@teamix/utils';
+import { Ellipsis, getCookie } from '@teamix/utils';
 var CheckboxItem = Menu.CheckboxItem;
 var Row = Grid.Row,
     Col = Grid.Col;
-var cls = baseClass('teamix-pro-table-toolbar-filter-column');
+var cls = baseClass('teamix-pro-table-toolbar-filter-column'); // 判断是否是 root 组织
+
+var isRoot = getCookie('organizationId') === '1';
 
 var processColumns = function processColumns(columns) {
+  if (isRoot) {
+    // root 组织下不显示标签管理
+    columns = columns.filter(function (item) {
+      return item.valueType !== 'selectGroup';
+    });
+  }
+
   return columns.map(function (item) {
     if (item.columnFilters === false) {
       return item;
@@ -296,7 +305,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
           return onChangeColumns(check, dataIndex);
         },
         disabled: columnFiltersDisabled
-      }, title, !lock && /*#__PURE__*/React.createElement("div", {
+      }, title, !lock && !columnFiltersDisabled && /*#__PURE__*/React.createElement("div", {
         className: cls({
           sort: true
         })

package/es/table/components/ToolBar/index.scss

@@ -27,9 +27,9 @@
       line-height: var(--checkbox-size,16px);
     }
   }
-  &-reset {
+  &-reset.next-btn {
     position: absolute;
-    right: 16px;
+    right: 0px;
     top: 6px;
   }
   // .next-menu {
@@ -59,7 +59,7 @@
     .teamix-pro-table-toolbar-filter-column-sort {
       visibility: hidden;
       position: absolute;
-      right: 16px;
+      right: 0px;
       top: 0;
       color: var(--color-text1-7);
       i {

package/es/table/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords"];
+var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll"];
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
@@ -178,6 +178,9 @@ var ProTable = function ProTable(props) {
       defaultFilterParams = props.defaultFilterParams,
       _props$reserveSelecte = props.reserveSelectedRecords,
       reserveSelectedRecords = _props$reserveSelecte === void 0 ? false : _props$reserveSelecte,
+      _props$size = props.size,
+      propsSize = _props$size === void 0 ? 'medium' : _props$size,
+      disableSelectAll = props.disableSelectAll,
       otherProps = _objectWithoutProperties(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -231,7 +234,7 @@ var ProTable = function ProTable(props) {
       filteredColumns = _useState16[0],
       setFilteredColumns = _useState16[1];
 
-  var _useState17 = useState('medium'),
+  var _useState17 = useState(propsSize),
       _useState18 = _slicedToArray(_useState17, 2),
       size = _useState18[0],
       _setSize = _useState18[1];
@@ -354,7 +357,7 @@ var ProTable = function ProTable(props) {
         result = propsRowSelection.titleProps();
       }
 
-      if (showSkeleton) {
+      if (showSkeleton || disableSelectAll) {
         result.disabled = true;
       }
 
@@ -389,7 +392,7 @@ var ProTable = function ProTable(props) {
       return selectedRowKeys.includes(k);
     });
     return {
-      disabled: showLoading && !showSkeleton && (getData.loading || props.loading),
+      disabled: disableSelectAll || showLoading && !showSkeleton && (getData.loading || props.loading),
       onChange: function onChange(check) {
         if (check) {
           var result = selectedRowKeys.concat([]);
@@ -493,6 +496,7 @@ var ProTable = function ProTable(props) {
         emit('refreshFilterState', newColumns);
       }
     },
+    size: size,
     setSize: function setSize(mode) {
       _setSize(mode);
     },

package/es/table/index.scss

@@ -121,7 +121,17 @@ $fullscreenPadding: 24px;
 }
 
 .next-table {
-  .next-formily-item .next-form-preview {
+  .next-form-preview.next-form-preview {
     line-height: unset;
   }
+  &-row {
+    .teamix-pro-field.teamix-pro-field-text .next-form-preview {
+      color: var(--table-row-color);
+    }
+  }
+  &-row.hovered {
+    .teamix-pro-field.teamix-pro-field-text .next-form-preview {
+      color: var(--table-row-hover-color);
+    }
+  }
 }

package/es/table/typing.d.ts

@@ -135,6 +135,8 @@ export declare type ProTableProps = {
     defaultFilterParams?: {
         [key: string]: any[] | any;
     };
+    /** 禁用掉批量选择中的全选 */
+    disableSelectAll?: boolean;
 } & Omit<TableProps, 'columns'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;
@@ -160,6 +162,8 @@ export declare type ProTableActionType = {
     fullScreen?: () => boolean;
     /** 设置显示列 */
     setColumn?: (newColumns: ProColumnProps[], update?: boolean) => void;
+    /** 表格尺寸 */
+    size?: 'small' | 'medium';
     /** 设置表格大小 */
     setSize?: (mode: 'small' | 'medium') => void;
     /** 刷新表格 */

package/es/table/utils/columnRender.js

@@ -158,6 +158,12 @@ export var renderCell = function renderCell(value, item, index, record, actionRe
         }
       }, props);
     }
+
+    if ((render === null || render === void 0 ? void 0 : render.type) === 'step') {
+      newRender = _objectSpread(_objectSpread({}, newRender), {}, {
+        ellipsis: false
+      });
+    }
   } // 渲染操作组
 
 

package/lib/actions/dialog-form.js

@@ -23,7 +23,7 @@ var _dialog = _interopRequireDefault(require("./dialog"));
 var _utils2 = require("./utils");
 
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef", "extendParams"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -168,6 +168,7 @@ function useDialogFormAction(action, context) {
       _onFinish = action.onFinish,
       propsBeforeRequest = action.beforeRequest,
       propsFormRef = action.formRef,
+      propsExtendParams = action.extendParams,
       others = _objectWithoutProperties(action, _excluded2);
 
   var innerFormRef = /*#__PURE__*/(0, _react.createRef)();
@@ -188,10 +189,12 @@ function useDialogFormAction(action, context) {
         formRef: propsFormRef
       }, dialogFormProps));
     },
-    extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
+    extendParams: useFieldValuesForRequest ? ['{{fields}}', propsExtendParams] : propsExtendParams,
     beforeRequest: function beforeRequest(context) {
       return new Promise(function (resolve, reject) {
         innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+          var _innerFormRef$current;
+
           var beforeRequestContext, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -227,7 +230,7 @@ function useDialogFormAction(action, context) {
 
                 case 13:
                   requestContext = Object.assign({
-                    fields: innerFormRef.current.values
+                    fields: (_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values
                   }, _typeof(beforeRequestContext) === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
@@ -243,9 +246,9 @@ function useDialogFormAction(action, context) {
       });
     },
     onFinish: function onFinish() {
-      var _innerFormRef$current;
+      var _innerFormRef$current2;
 
-      _onFinish && _onFinish((_innerFormRef$current = innerFormRef.current) === null || _innerFormRef$current === void 0 ? void 0 : _innerFormRef$current.values);
+      _onFinish && _onFinish((_innerFormRef$current2 = innerFormRef.current) === null || _innerFormRef$current2 === void 0 ? void 0 : _innerFormRef$current2.values);
     }
   }, others), context);
 }

package/lib/actions/dialog.js

@@ -236,9 +236,7 @@ function useDialogAction(action, actionContext) {
     var dialogContext = Object.assign({}, context, {
       hide: hide
     });
-    var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({
-      key: (0, _utils.uuid)()
-    }, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
+    var dialogContent = Component ? /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, (0, _utils2.addContext)(componentProps, dialogContext))) : addContextForReactNode(content, dialogContext);
 
     var quickShowProps = _objectSpread(_objectSpread((_objectSpread2 = {}, _defineProperty(_objectSpread2, "".concat(isPop ? 'onConfirm' : 'onOk'), onOk), _defineProperty(_objectSpread2, "title", addContextForReactNode(title, dialogContext)), _defineProperty(_objectSpread2, "content", /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, beforeContent && /*#__PURE__*/_react.default.createElement("div", {
       className: "teamix-pro-dialog-before-content"