@teamix/pro 1.2.34 → 1.2.35

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) {
+var initializeDataSource = function initializeDataSource(dataSource, suffix, readPretty) {
   if ((0, _utils.isPlainObj)(dataSource)) {
     var requestConfig = dataSource;
     var requestConfigName = "$requestConfig_".concat(suffix);
     return {
-      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context)}}")],
+      reactions: ["{{$dataSource($request,".concat(requestConfigName, ",context,").concat(readPretty, ")}}")],
       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: string | number) => Promise<unknown>;
 declare const $common: (services: any, requestConfig: ProFormRequestConfig, context: any, index: string) => (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

@@ -66,28 +66,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, 'dataSource').then(function (res) {
+    if (!readPretty) {
+      field.setState({
+        loading: true,
+        readOnly: true
+      });
+    }
+
+    return services(field, requestConfig, context).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/index.d.ts

@@ -24,5 +24,5 @@ export * from './skeleton';
 export * from './table';
 export * from './utils';
 export * from './step';
-declare const version = "1.2.34";
+declare const version = "1.2.35";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProStep, 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.2.34';
+var version = '1.2.35';
 exports.version = version;

package/lib/page-header/index.js

@@ -88,8 +88,8 @@ 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)(color) : backgroundColor;
   var style = {
     color: styleColor,
     backgroundColor: styleBgColor

package/lib/table/index.js

@@ -344,8 +344,8 @@ var ProTable = function ProTable(props) {
   var normalDataFilterForm = normalDataFilterFormRef.current;
   var fullscreenDataFilterForm = fullscreenDataFilterFormRef.current; // 传给 QueryFilter 的 formRef
 
-  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
-  var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
+  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef; // let dataFilterForm = dataFilterFormRef.current;
+  // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
 
   var _useState29 = (0, _react.useState)(false),
       _useState30 = _slicedToArray(_useState29, 2),
@@ -554,12 +554,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current4, _actionRef$current4$s;
+      var _actionRef$current4, _actionRef$current4$s, _dataFilterFormRef$cu;
 
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
       (_actionRef$current4 = actionRef.current) === null || _actionRef$current4 === void 0 ? void 0 : (_actionRef$current4$s = _actionRef$current4.setFilterRules) === null || _actionRef$current4$s === void 0 ? void 0 : _actionRef$current4$s.call(_actionRef$current4, {});
-      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
+      (_dataFilterFormRef$cu = dataFilterFormRef.current) === null || _dataFilterFormRef$cu === void 0 ? void 0 : _dataFilterFormRef$cu.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1));
@@ -581,7 +581,8 @@ var ProTable = function ProTable(props) {
       pageSize: pageSize
     },
     data: data,
-    dataFilterForm: dataFilterForm,
+    dataFilterForm: dataFilterFormRef.current,
+    dataFilterFormRef: dataFilterFormRef,
     normalDataFilterForm: normalDataFilterForm,
     fullscreenDataFilterForm: fullscreenDataFilterForm,
     filterEnableRef: filterEnableRef,
@@ -674,7 +675,7 @@ var ProTable = function ProTable(props) {
   }); // 请求函数
 
   function _request(params, noLoading, filterParams) {
-    var _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
+    var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current5, _actionRef$current5$g, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -687,7 +688,7 @@ var ProTable = function ProTable(props) {
 
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = filterParams !== null && filterParams !== void 0 ? filterParams : dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.values; // 列过滤请求参数
+    var dataFilterParams = filterParams !== null && filterParams !== void 0 ? filterParams : (_dataFilterFormRef$cu2 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu2 === void 0 ? void 0 : _dataFilterFormRef$cu2.values; // 列过滤请求参数
 
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current5 = actionRef.current) === null || _actionRef$current5 === void 0 ? void 0 : (_actionRef$current5$g = _actionRef$current5.getFilterRules) === null || _actionRef$current5$g === void 0 ? void 0 : _actionRef$current5$g.call(_actionRef$current5)) !== null && _actionRef$current$ge !== void 0 ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
@@ -785,6 +786,7 @@ var ProTable = function ProTable(props) {
   }, propsDataFilter), {}, {
     onInit: function onInit(values) {
       // 表单初始化请求处理
+      console.log('onInit');
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit(values));
       !fullscreenState && _request({}, false, values);
       return true;
@@ -792,7 +794,8 @@ var ProTable = function ProTable(props) {
     onFilter: function onFilter(values) {
       var _actionRef$current6, _actionRef$current6$c;
 
-      // 全屏状态，判断全屏表单onFilter是否禁用
+      console.log('onFilter'); // 全屏状态，判断全屏表单onFilter是否禁用
+
       if (fullscreenState && !filterEnableRef.current.fullscreen) {
         filterEnableRef.current.fullscreen = true;
         return;
@@ -812,8 +815,10 @@ var ProTable = function ProTable(props) {
       _request(_defineProperty({}, targetPageKey, 1), false, values);
     },
     onReset: function onReset(values) {
+      var _dataFilterFormRef$cu3;
+
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onReset());
-      dataFilterForm === null || dataFilterForm === void 0 ? void 0 : dataFilterForm.reset();
+      (_dataFilterFormRef$cu3 = dataFilterFormRef.current) === null || _dataFilterFormRef$cu3 === void 0 ? void 0 : _dataFilterFormRef$cu3.reset();
       setCurrentPage(1);
 
       _request(_defineProperty({}, targetPageKey, 1), false, values);

package/lib/table/typing.d.ts

@@ -190,6 +190,8 @@ export declare type ProTableActionType = {
     resetPage?: () => void;
     /** 获取数据过滤区表单实例 */
     dataFilterForm?: FormType;
+    /** 用于在 mount 的时候获取到表单 ref */
+    dataFilterFormRef?: React.MutableRefObject<FormType>;
     normalDataFilterForm?: FormType;
     fullscreenDataFilterForm?: FormType;
     filterEnableRef?: any;

package/package.json

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