@teamix/pro 1.3.0 → 1.3.1

package/dist/pro.js

@@ -27642,7 +27642,7 @@ TeamixIcon.YUNXIAO = {
   symbolPrefix: 'yunxiao-'
 };
 TeamixIcon.HYBRIDCLOUD = {
-  scriptUrl: '//at.alicdn.com/t/font_2436140_xd91cirfxss.js',
+  scriptUrl: '//at.alicdn.com/t/font_2436140_6xkz3wwgcot.js',
   symbolPrefix: 'hybridcloud-'
 };
 TeamixIcon.displayName = 'TeamixIcon';
@@ -59854,7 +59854,7 @@ function useDangerPopConfirmAction(action, context) {
 /* harmony import */ var _dialog__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(28653);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(95983);
 var _excluded = ["schema"],
-    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest"];
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "beforeRequest", "formRef"];
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
@@ -59930,7 +59930,8 @@ var DialogForm = function DialogForm(props) {
       schema = props.schema,
       formProps = props.formProps,
       context = props.context,
-      formRef = props.formRef;
+      formRef = props.formRef,
+      innerFormRef = props.innerFormRef;
 
   var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
       formSchema = _getSchemaAndFormProp.schema,
@@ -59946,7 +59947,11 @@ var DialogForm = function DialogForm(props) {
 
   var history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_1__.useHistory)();
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
-    formRef.current = form;
+    if (formRef) {
+      formRef.current = form;
+    }
+
+    innerFormRef.current = form;
 
     if (initialRequest) {
       setLoading(true);
@@ -59981,9 +59986,10 @@ function useDialogFormAction(action, context) {
       size = _action$size === void 0 ? 'small' : _action$size,
       _onFinish = action.onFinish,
       propsBeforeRequest = action.beforeRequest,
+      propsFormRef = action.formRef,
       others = _objectWithoutPropertiesLoose(action, _excluded2);
 
-  var formRef = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.createRef)();
+  var innerFormRef = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.createRef)();
   return (0,_dialog__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(Object.assign({
     size: size,
     closeable: true,
@@ -59997,13 +60003,14 @@ function useDialogFormAction(action, context) {
         context: contentContext
       };
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(DialogForm, _extends({
-        formRef: formRef
+        innerFormRef: innerFormRef,
+        formRef: propsFormRef
       }, dialogFormProps));
     },
     extendParams: useFieldValuesForRequest ? '{{fields}}' : undefined,
     beforeRequest: function beforeRequest(context) {
       return new Promise(function (resolve, reject) {
-        formRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        innerFormRef.current.validate().then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
           var beforeRequestContext, requestContext;
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -60039,7 +60046,7 @@ function useDialogFormAction(action, context) {
 
                 case 13:
                   requestContext = Object.assign({
-                    fields: formRef.current.values
+                    fields: innerFormRef.current.values
                   }, typeof beforeRequestContext === 'object' ? beforeRequestContext : {});
                   resolve(requestContext);
 
@@ -60055,9 +60062,9 @@ function useDialogFormAction(action, context) {
       });
     },
     onFinish: function onFinish() {
-      var _formRef$current;
+      var _innerFormRef$current;
 
-      _onFinish && _onFinish((_formRef$current = formRef.current) == null ? void 0 : _formRef$current.values);
+      _onFinish && _onFinish((_innerFormRef$current = innerFormRef.current) == null ? void 0 : _innerFormRef$current.values);
     }
   }, others), context);
 }
@@ -63962,14 +63969,14 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
     });
   }, [scope]); // 格式化 schema
 
-  var formatSchema = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (schema, suffix) {
-    if (suffix === void 0) {
-      suffix = '';
+  var formatSchema = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (schema, parentSuffix) {
+    if (parentSuffix === void 0) {
+      parentSuffix = '';
     }
 
     var schemaProperties = {};
     schema == null ? void 0 : schema.forEach(function (item, index) {
-      suffix = "" + suffix + index;
+      var suffix = "" + parentSuffix + index;
       var newItem = (0,_warning__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(item);
       var _newItem = newItem,
           originalComponent = _newItem.component; // 根据component的不同，初始化为内置的item
@@ -65751,7 +65758,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_14__/* ["default"].setConfig */ .Z.setConf
  // export * from './sidebar';
 
 
-var version = '1.3.0';
+var version = '1.3.1';
 
 
 /***/ }),
@@ -68691,7 +68698,11 @@ var getColorAndStyle = function getColorAndStyle(color, backgroundColor, backgro
   var isBgColorPresetColor = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.isPresetColor)(backgroundColor);
   var className = classnames__WEBPACK_IMPORTED_MODULE_2___default()((_classnames = {}, _classnames["" + (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getColorClassName)(color)] = isColorPresetColor, _classnames["" + (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getBackgroundColorClassName)(backgroundColor)] = isBgColorPresetColor, _classnames["" + cls("bg-type-" + backgroundType)] = !!backgroundType, _classnames));
   var styleColor = isColorPresetColor ? (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getColor)(color) : color;
-  var styleBgColor = isBgColorPresetColor ? (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getColor)(color) : backgroundColor;
+  var styleBgColor = isBgColorPresetColor ? (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getColor)(backgroundColor) : backgroundColor; // debugger;
+  // console.log('color', color);
+  // console.log('backgroundColor', backgroundColor);
+  // console.log('styleBgColor', styleBgColor);
+
   var style = {
     color: styleColor,
     backgroundColor: styleBgColor
@@ -70538,7 +70549,7 @@ var ToolBar = function ToolBar(props) {
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(28266);
 /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_14__);
 /* harmony import */ var _page_container__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(2781);
-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"];
+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"];
 
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
@@ -70694,6 +70705,8 @@ var ProTable = function ProTable(props) {
       _props$filterColumnTy = props.filterColumnType,
       filterColumnType = _props$filterColumnTy === void 0 ? 'auto' : _props$filterColumnTy,
       defaultFilterParams = props.defaultFilterParams,
+      _props$reserveSelecte = props.reserveSelectedRecords,
+      reserveSelectedRecords = _props$reserveSelecte === void 0 ? false : _props$reserveSelecte,
       otherProps = _objectWithoutPropertiesLoose(props, _excluded);
 
   var targetPageKey = pageKey || globalPageKey;
@@ -70842,7 +70855,7 @@ var ProTable = function ProTable(props) {
         result = propsRowSelection.getProps(record, index);
       }
 
-      if (showSkeleton) {
+      if (showSkeleton && result) {
         result.disabled = true;
       }
 
@@ -71367,24 +71380,34 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage, params) {
-      var _actionRef$current7, _objectSpread3;
+      var _objectSpread3;
 
       if (params === void 0) {
         params = {};
       }
 
-      // 翻页暂时先清空选择
-      (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.clearRowSelection == null ? void 0 : _actionRef$current7.clearRowSelection();
+      // 翻页默认清空选择
+      if (!reserveSelectedRecords) {
+        var _actionRef$current7;
+
+        (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.clearRowSelection == null ? void 0 : _actionRef$current7.clearRowSelection();
+      }
+
       setCurrentPage(currentPage);
 
       _request(_objectSpread((_objectSpread3 = {}, _objectSpread3[targetPageKey] = currentPage, _objectSpread3), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _actionRef$current8, _request5;
+      var _request5;
+
+      // 翻页默认清空选择
+      if (!reserveSelectedRecords) {
+        var _actionRef$current8;
+
+        (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
+      }
 
-      // 翻页暂时先清空选择
-      (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
       setPageSize(currentPageSize);
       setCurrentPage(1);
 
@@ -74355,7 +74378,7 @@ var getTeamixIconConfig = function getTeamixIconConfig() {
   } else return {
     scriptUrl: [// 基础图标
     _teamix_icon__WEBPACK_IMPORTED_MODULE_0__/* ["default"].HYBRIDCLOUD.scriptUrl */ .Z.HYBRIDCLOUD.scriptUrl, // 业务图标
-    '//at.alicdn.com/t/font_2436199_gyzxznijroe.js'],
+    '//at.alicdn.com/t/font_2436199_w7hg5mml87f.js'],
     symbolPrefix: 'hybridcloud-'
   };
 };