@teamix/pro 1.2.33 → 1.3.1

package/lib/form/SchemaForm/initializeRequest.js

@@ -5,15 +5,50 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _utils = require("@teamix/utils");
+
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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; }
+
 var initializeRequest = function initializeRequest(requestConfig, suffix) {
   if (requestConfig) {
-    var requestConfigName = "$requestConfig_".concat(suffix);
-    return {
-      reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
-      scope: _defineProperty({}, requestConfigName, requestConfig)
-    };
+    if ((0, _utils.isArr)(requestConfig)) {
+      var reactionsMap = [];
+      var scopeMap = {};
+      requestConfig.forEach(function (item, index) {
+        var _initializeRequest = initializeRequest(item, "".concat(suffix).concat(index)),
+            reactions = _initializeRequest.reactions,
+            scope = _initializeRequest.scope;
+
+        reactionsMap = [].concat(_toConsumableArray(reactionsMap), _toConsumableArray(reactions));
+        scopeMap = _objectSpread(_objectSpread({}, scopeMap), scope);
+      });
+      return {
+        reactions: reactionsMap,
+        scope: scopeMap
+      };
+    } else {
+      var requestConfigName = "$requestConfig_".concat(suffix);
+      return {
+        reactions: ["{{$common($request,".concat(requestConfigName, ",context)}}")],
+        scope: _defineProperty({}, requestConfigName, requestConfig)
+      };
+    }
   }
 
   return {

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

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

package/lib/form/SchemaForm/reactions.js

@@ -14,14 +14,19 @@ 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; }
 
 // 配置请求
-var $request = function $request(field, requestConfig, context) {
+var $request = function $request(field, requestConfig, context, type) {
   var _field$data;
 
-  var refresh = field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
   var beforeRequest = requestConfig.beforeRequest,
       onSuccess = requestConfig.onSuccess;
-  var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {};
   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),
     beforeRequest: function beforeRequest() {
@@ -38,7 +43,7 @@ exports.$request = $request;
 
 var $common = function $common(services, requestConfig, context) {
   return function (field) {
-    return services(field, requestConfig, context).then(function (res) {
+    return services(field, requestConfig, context, 'request').then(function (res) {
       return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
@@ -50,7 +55,7 @@ exports.$common = $common;
 var $validator = function $validator(services, requestConfig, context) {
   return function (value, rules, _ref) {
     var field = _ref.field;
-    return services(field, requestConfig, context).then(function (res) {
+    return services(field, requestConfig, context, 'validator').then(function (res) {
       return requestConfig.onComplete && requestConfig.onComplete(res, field, context);
     });
   };
@@ -59,28 +64,41 @@ var $validator = function $validator(services, requestConfig, context) {
 
 exports.$validator = $validator;
 
-var $dataSource = function $dataSource(services, requestConfig, context) {
+var $dataSource = function $dataSource(services, requestConfig, context, readPretty) {
   return function (field) {
-    field.setState({
-      loading: true,
-      readOnly: true
-    });
-    return services(field, requestConfig, context).then(function (res) {
+    if (!readPretty) {
+      field.setState({
+        loading: true,
+        readOnly: true
+      });
+    }
+
+    return services(field, requestConfig, context, 'dataSource').then(function (res) {
       var isValueInDataSource = (0, _utils.getValueByValue)(res, field.value);
       var clearValue = isValueInDataSource ? {} : {
         value: undefined
       };
-      field.setState(_objectSpread({
-        dataSource: res,
-        loading: false,
-        readOnly: false
-      }, clearValue));
+
+      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);
     }).catch(function () {
-      field.setState({
-        loading: false,
-        readOnly: false
-      });
+      if (!readPretty) {
+        field.setState({
+          loading: false,
+          readOnly: false
+        });
+      }
     });
   };
 };

package/lib/form/typing.d.ts

@@ -10,6 +10,10 @@ declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
 export interface ProFormInitializeItem {
     (item: ProFormSchemaItem, props?: any): ProFormSchemaItem;
 }
+/**
+ * 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 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';
@@ -44,7 +48,7 @@ export interface ProFormSchemaItem {
     readPretty?: boolean | string;
     pattern?: FieldPatternTypes;
     default?: any;
-    request?: ProFormRequestConfig;
+    request?: ProFormRequestConfig | ProFormRequestConfig[];
     data?: AnyObject;
 }
 export declare type ProFormSchema = ProFormSchemaItem[];
@@ -63,12 +67,14 @@ export interface ProFormProps extends IFormLayoutProps {
     onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
+    onInitialComplete?: (form: FormType) => void;
 }
 export interface FilterProps extends ProFormProps {
     form: FormType;
     defaultFilterValue?: string;
+    activeFilterValueRef?: React.MutableRefObject<any>;
+    forceClear?: boolean;
     onReset?: (payload?: any) => void;
-    onResetClick?: () => void;
 }
 export interface QueryFilterLayoutProps {
     prefixCls?: string;
@@ -92,6 +98,8 @@ export interface QueryFilterProps extends ProFormProps {
     purePanel?: boolean;
     /** 面板是否默认展开，仅在 mode='panel' 时生效 */
     expand?: boolean;
+    /** 是否强制清除 */
+    forceClear?: boolean;
     /** 顶部筛选区前缀 */
     addonBefore?: ReactNode;
     /** 顶部筛选区后缀 */

package/lib/index.d.ts

@@ -9,7 +9,7 @@ import ProPageHeader from './page-header';
 import ProTable from './table';
 import ProSkeleton from './skeleton';
 import utils from './utils';
-import { ProStep } from './step';
+import { ProTimeline } from './timeline';
 import * as nocode from './nocode';
 import * as templates from './templates';
 export * from './actions';
@@ -23,6 +23,6 @@ export * from './page-header';
 export * from './skeleton';
 export * from './table';
 export * from './utils';
-export * from './step';
-declare const version = "1.2.33";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, hooks, nocode, templates, utils, };
+export * from './timeline';
+declare const version = "1.3.1";
+export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProTimeline, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -18,7 +18,7 @@ var _exportNames = {
   ProTable: true,
   ProSkeleton: true,
   utils: true,
-  ProStep: true,
+  ProTimeline: true,
   nocode: true,
   templates: true
 };
@@ -70,16 +70,16 @@ Object.defineProperty(exports, "ProSkeleton", {
     return _skeleton.default;
   }
 });
-Object.defineProperty(exports, "ProStep", {
+Object.defineProperty(exports, "ProTable", {
   enumerable: true,
   get: function get() {
-    return _step.ProStep;
+    return _table.default;
   }
 });
-Object.defineProperty(exports, "ProTable", {
+Object.defineProperty(exports, "ProTimeline", {
   enumerable: true,
   get: function get() {
-    return _table.default;
+    return _timeline.ProTimeline;
   }
 });
 Object.defineProperty(exports, "hooks", {
@@ -239,16 +239,16 @@ Object.keys(_utils).forEach(function (key) {
   });
 });
 
-var _step = require("./step");
+var _timeline = require("./timeline");
 
-Object.keys(_step).forEach(function (key) {
+Object.keys(_timeline).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _step[key]) return;
+  if (key in exports && exports[key] === _timeline[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _step[key];
+      return _timeline[key];
     }
   });
 });
@@ -285,5 +285,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.2.33';
+var version = '1.3.1';
 exports.version = version;

package/lib/nocode/configurators/PageHeader.js

@@ -88,11 +88,11 @@ var schema = [{
         }, {
           name: 'iconColor',
           title: '图标颜色',
-          component: 'ColorSwatches'
+          component: 'ColorPicker'
         }, {
           name: 'iconBackgroundColor',
           title: '图标背景颜色',
-          component: 'ColorSwatches'
+          component: 'ColorPicker'
         }, {
           name: 'iconBackgroundType',
           title: '图标背景形状',

package/lib/page-header/index.js

@@ -88,8 +88,12 @@ var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgro
   var isColorPresetColor = (0, _utils.isPresetColor)(color);
   var isBgColorPresetColor = (0, _utils.isPresetColor)(backgroundColor);
   var className = (0, _classnames2.default)((_classnames = {}, _defineProperty(_classnames, "".concat((0, _utils.getColorClassName)(color)), isColorPresetColor), _defineProperty(_classnames, "".concat((0, _utils.getBackgroundColorClassName)(backgroundColor)), isBgColorPresetColor), _defineProperty(_classnames, "".concat(cls("bg-type-".concat(backgroundType))), !!backgroundType), _classnames));
-  var styleColor = isColorPresetColor ? undefined : color;
-  var styleBgColor = isBgColorPresetColor ? undefined : backgroundColor;
+  var styleColor = isColorPresetColor ? (0, _utils.getColor)(color) : color;
+  var styleBgColor = isBgColorPresetColor ? (0, _utils.getColor)(backgroundColor) : backgroundColor; // debugger;
+  // console.log('color', color);
+  // console.log('backgroundColor', backgroundColor);
+  // console.log('styleBgColor', styleBgColor);
+
   var style = {
     color: styleColor,
     backgroundColor: styleBgColor

package/lib/table/components/Layout/index.js

@@ -172,13 +172,13 @@ var Layout = function Layout(props) {
         className: cls('wrapper')
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: cls('left')
-      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header)), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter()), /*#__PURE__*/_react.default.createElement("div", {
+      }, header && /*#__PURE__*/_react.default.createElement(_utils.Header, _objectSpread({}, header))), /*#__PURE__*/_react.default.createElement("div", {
         className: cls('right')
       }, extra && /*#__PURE__*/_react.default.createElement(_QuickAction.default, {
         actionRef: actionRef,
         quickAction: extra,
         rowSelection: rowSelection
-      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter())));
+      }), !(dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema3 = dataFilter.schema) === null || _dataFilter$schema3 === void 0 ? void 0 : _dataFilter$schema3.length) && renderQueryFilter())), (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema4 = dataFilter.schema) === null || _dataFilter$schema4 === void 0 ? void 0 : _dataFilter$schema4.length) && renderQueryFilter());
     } else if (!header && mainAction) {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderQueryFilter());
     } else if (!header && !mainAction) {

package/lib/table/components/Pagination/index.js

@@ -64,6 +64,13 @@ var _default = function _default(props) {
       responsiveProps = _useResponsiveProps.responsiveProps,
       paginationWrapperRef = _useResponsiveProps.ref;
 
+  (0, _react.useEffect)(function () {
+    // size='mini' 模式下 current 受控
+    if (responsiveProps === 'mini') {
+      setCurrentPage(current);
+    }
+  }, [current]);
+
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
@@ -100,6 +107,9 @@ var _default = function _default(props) {
         text: true,
         onMouseEnter: function onMouseEnter() {
           return setVisible(true);
+        },
+        style: {
+          lineHeight: '18px'
         }
       }, (0, _utils.getMessage)('total', {
         total: total

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

@@ -25,7 +25,8 @@ var FullScreen = function FullScreen(props) {
       actionRef = props.actionRef;
   var _actionRef$current = actionRef.current,
       normalDataFilterForm = _actionRef$current.normalDataFilterForm,
-      fullscreenDataFilterForm = _actionRef$current.fullscreenDataFilterForm;
+      fullscreenDataFilterForm = _actionRef$current.fullscreenDataFilterForm,
+      filterEnableRef = _actionRef$current.filterEnableRef;
 
   var closeByESC = function closeByESC(e) {
     if (visible && e.code === 'Escape') {
@@ -44,12 +45,38 @@ var FullScreen = function FullScreen(props) {
   }, [visible, actionRef]);
 
   var afterClose = function afterClose() {
-    normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm.values);
+    // 判断全屏前后筛选表单值是否有改变
+    var n = JSON.stringify((0, _utils.getValidValues)(normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values));
+    var f = JSON.stringify((0, _utils.getValidValues)(fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.values));
+
+    if (n === f) {
+      // 关闭全屏后，表单值未变化，开启普通表单onFilter
+      filterEnableRef.current.normal = true;
+    } else {
+      // 关闭全屏后，表单值有变化，修改表单值
+      normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.values);
+    } // 关闭全屏后，关闭全屏表单onFilter
+
+
+    filterEnableRef.current.fullscreen = false;
   }; // 全屏开启之后
 
 
   var afterOpen = function afterOpen() {
-    fullscreenDataFilterForm.setValues(normalDataFilterForm.values);
+    // 判断全屏前后筛选表单值是否有改变
+    var n = JSON.stringify((0, _utils.getValidValues)(normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values));
+    var f = JSON.stringify((0, _utils.getValidValues)(fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.values));
+
+    if (n === f) {
+      // 全屏后，表单值未变化，开启全屏表单onFilter
+      filterEnableRef.current.fullscreen = true;
+    } else {
+      // 全屏后，表单值变化，修改表单值
+      fullscreenDataFilterForm === null || fullscreenDataFilterForm === void 0 ? void 0 : fullscreenDataFilterForm.setValues(normalDataFilterForm === null || normalDataFilterForm === void 0 ? void 0 : normalDataFilterForm.values);
+    } // 全屏后，关闭普通表单onFilter
+
+
+    filterEnableRef.current.normal = false; // 消息提示
 
     _components.Message.show({
       type: 'notice',