@teamix/pro 1.3.1 → 1.3.2

package/lib/form/SchemaForm/index.js

@@ -244,10 +244,10 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 
       var _initializeRequest = (0, _initializeRequest2.default)(request, "".concat(suffix, "r")),
           requestReactions = _initializeRequest.reactions,
-          requestScope = _initializeRequest.scope; // 初始化dataSource，如果readPretty为字符串表达式将失去loading等状态，仍可配置dataSource
+          requestScope = _initializeRequest.scope; // 初始化dataSource
 
 
-      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, "".concat(suffix, "d"), newItem.readPretty),
+      var _initializeDataSource = (0, _initializeDataSource2.default)(dataSource, "".concat(suffix, "d")),
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
           dataSourceScope = _initializeDataSource.scope; // 初始化rules validator

package/lib/form/SchemaForm/initializeDataSource.d.ts

@@ -1,6 +1,6 @@
 import type { ProFormRequestConfig } from '../typing';
 interface IInitializeDataSource {
-    (requestConfig?: ProFormRequestConfig | any, suffix?: string, readPretty?: string | boolean): {
+    (requestConfig?: ProFormRequestConfig | any, suffix?: string): {
         dataSource?: any[];
         reactions: any[];
         scope: {

package/lib/form/SchemaForm/initializeDataSource.js

@@ -9,12 +9,12 @@ var _utils = require("@teamix/utils");
 
 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; }
 
-var initializeDataSource = function initializeDataSource(dataSource, suffix, readPretty) {
+var initializeDataSource = function initializeDataSource(dataSource, suffix) {
   if ((0, _utils.isPlainObj)(dataSource)) {
     var requestConfig = dataSource;
     var requestConfigName = "$requestConfig_".concat(suffix);
     return {
-      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context,").concat(readPretty, ")}}")],
+      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
       scope: _defineProperty({}, requestConfigName, requestConfig)
     };
   }

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

@@ -2,5 +2,5 @@ import type { ProFormRequestConfig } from '../typing';
 declare const $request: (field: any, 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/lib/form/SchemaForm/reactions.js

@@ -17,18 +17,19 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var $request = function $request(field, requestConfig, context, type) {
   var _field$data;
 
-  var beforeRequest = requestConfig.beforeRequest,
+  var params = requestConfig.params,
+      beforeRequest = requestConfig.beforeRequest,
       onSuccess = requestConfig.onSuccess;
   var beforeRequestResult = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
   /**
-   * // 主动触发的请求刷新
+   * 主动触发的请求刷新
    */
   // 触发所有配置的请求
 
   var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
   var refreshResult = (0, _utils.isPureObj)(refresh) ? refresh : {};
   return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
-    params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
+    params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {
       return beforeRequestResult;
     },
@@ -44,7 +45,9 @@ exports.$request = $request;
 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);
     });
   };
 }; // 配置校验
@@ -56,7 +59,9 @@ var $validator = function $validator(services, requestConfig, context) {
   return function (value, rules, _ref) {
     var field = _ref.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
@@ -64,41 +69,36 @@ var $validator = function $validator(services, requestConfig, context) {
 
 exports.$validator = $validator;
 
-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
+    });
+    field.setComponentProps({
+      readOnly: true
+    });
     return services(field, requestConfig, context, 'dataSource').then(function (res) {
+      var _requestConfig$onComp3;
+
       var isValueInDataSource = (0, _utils.getValueByValue)(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         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
+      }, clearValue));
+      field.setComponentProps({
+        readOnly: false
+      });
+      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
+      });
+      field.setComponentProps({
+        readOnly: false
+      });
     });
   };
 };

package/lib/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/lib/form/fieldTypeMap.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.timePicker2TypeArray = exports.default = exports.datePicker2TypeArray = void 0;
 var fieldTypeMap = {
   Input: 'text',
   Password: 'password',
@@ -46,5 +46,9 @@ var fieldTypeMap = {
   Search: 'search',
   SelectGroup: 'selectGroup'
 };
+var datePicker2TypeArray = ['DatePicker', 'DateTimePicker', 'WeekPicker', 'MonthPicker', 'YearPicker', 'QuarterPicker', 'DateRangePicker', 'DateTimeRangePicker', 'WeekRangePicker', 'MonthRangePicker', 'YearRangePicker', 'QuarterRangePicker'];
+exports.datePicker2TypeArray = datePicker2TypeArray;
+var timePicker2TypeArray = ['TimePicker', 'TimeRangePicker'];
+exports.timePicker2TypeArray = timePicker2TypeArray;
 var _default = fieldTypeMap;
 exports.default = _default;

package/lib/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.2";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -285,5 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.3.1';
+var version = '1.3.2';
 exports.version = version;

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

@@ -39,9 +39,11 @@ var RadioItem = _components.Menu.RadioItem;
 var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-icon');
 
 var DensityIcon = function DensityIcon(props) {
+  var _actionRef$current;
+
   var actionRef = props.actionRef;
 
-  var _useState = (0, _react.useState)('medium'),
+  var _useState = (0, _react.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);
@@ -61,10 +63,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/lib/table/components/ToolBar/FilterColumnIcon.js

@@ -54,9 +54,18 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 var CheckboxItem = _components.Menu.CheckboxItem;
 var Row = _components.Grid.Row,
     Col = _components.Grid.Col;
-var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter-column');
+var cls = (0, _utils.baseClass)('teamix-pro-table-toolbar-filter-column'); // 判断是否是 root 组织
+
+var isRoot = (0, _utils.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;
@@ -313,7 +322,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
           return onChangeColumns(check, dataIndex);
         },
         disabled: columnFiltersDisabled
-      }, title, !lock && /*#__PURE__*/_react.default.createElement("div", {
+      }, title, !lock && !columnFiltersDisabled && /*#__PURE__*/_react.default.createElement("div", {
         className: cls({
           sort: true
         })

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

@@ -29,7 +29,7 @@
   }
   &-reset {
     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/lib/table/index.js

@@ -55,7 +55,7 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -222,6 +222,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;
@@ -275,7 +278,7 @@ var ProTable = function ProTable(props) {
       filteredColumns = _useState16[0],
       setFilteredColumns = _useState16[1];
 
-  var _useState17 = (0, _react.useState)('medium'),
+  var _useState17 = (0, _react.useState)(propsSize),
       _useState18 = _slicedToArray(_useState17, 2),
       size = _useState18[0],
       _setSize = _useState18[1];
@@ -398,7 +401,7 @@ var ProTable = function ProTable(props) {
         result = propsRowSelection.titleProps();
       }
 
-      if (showSkeleton) {
+      if (showSkeleton || disableSelectAll) {
         result.disabled = true;
       }
 
@@ -433,7 +436,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([]);
@@ -537,6 +540,7 @@ var ProTable = function ProTable(props) {
         (0, _utils2.emit)('refreshFilterState', newColumns);
       }
     },
+    size: size,
     setSize: function setSize(mode) {
       _setSize(mode);
     },

package/lib/table/index.scss

@@ -121,7 +121,7 @@ $fullscreenPadding: 24px;
 }
 
 .next-table {
-  .next-formily-item .next-form-preview {
+  .next-form-preview.next-form-preview {
     line-height: unset;
   }
 }

package/lib/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/lib/table/utils/columnRender.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",