@zat-design/sisyphus-react 3.11.6-beta.7 → 3.11.6-beta.9

package/es/ProForm/components/render/RenderFields.d.ts

@@ -10,6 +10,8 @@ interface Props<T = any> {
     form: FormInstance<T>;
     expand?: boolean | number;
     colProps?: ColProps;
+    /** 列宽占比 */
+    span?: number;
     viewEmpty?: React.ReactNode;
     openState?: boolean;
     labelWidth?: string | number;

package/es/ProForm/components/render/RenderFields.js

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization", "span"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isBoolean, isFunction, union, isString } from 'lodash';
@@ -75,6 +75,7 @@ var RenderFields = function RenderFields(props) {
       columnRequired = column.required,
       confirm = column.confirm,
       desensitization = column.desensitization,
+      span = column.span,
       otherFormItemProps = _objectWithoutProperties(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
@@ -169,7 +170,9 @@ var RenderFields = function RenderFields(props) {
     if (!TargetComponent) {
       return [];
     }
-    var _colProps = _objectSpread(_objectSpread({}, defaultColProps), colProps);
+    var _colProps = span ? {
+      span: span
+    } : _objectSpread(_objectSpread({}, defaultColProps), colProps);
     // 其余参数收进对象里传给子组件 componentProps只包含子组件参数
     var otherProps = {
       label: _formItemProps.label,

package/es/ProForm/components/render/propsType.d.ts

@@ -182,6 +182,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     }) => React.ReactElement<any, any> | string | undefined | null;
     viewType?: ViewType;
     colProps?: ColProps;
+    /** 列宽占比 */
+    span?: number;
     /** 依赖刷新字段列表 */
     dependNames?: NamePath[];
     /**
@@ -265,6 +267,8 @@ export interface RenderProps<Values = any> {
         disabledStrictly?: boolean;
         [name: string]: any;
     };
+    /** 列宽占比 */
+    span?: number;
     show?: boolean | ((values: Values, { form, index, namePath, }: {
         form: FormInstance<Values>;
         index?: number;

package/es/ProTable/hooks/useAntdTable.js

@@ -117,8 +117,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraParams]);
   // 调接口
   var result = useRequest(service, _objectSpread(_objectSpread({
-    debounceWait: 300,
-    refreshDeps: [curService, curExtraParams]
+    debounceWait: 300
   }, useRequestOptions), {}, {
     defaultParams: [getTransformParams()],
     onSuccess: function onSuccess(res, params) {
@@ -151,6 +150,14 @@ function useAntdTable(service, options, useRequestOptions) {
       selectedRowKeys: []
     });
   }, []);
+  /**
+   * 手动触发时，手动调用run
+   */
+  useEffect(function () {
+    if (!(useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual)) {
+      run(getTransformParams());
+    }
+  }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
   useDeepCompareEffect(function () {
     if (allSelected) {
       var filterList = data.filter(function (item) {

package/lib/ProForm/components/render/RenderFields.d.ts

@@ -10,6 +10,8 @@ interface Props<T = any> {
     form: FormInstance<T>;
     expand?: boolean | number;
     colProps?: ColProps;
+    /** 列宽占比 */
+    span?: number;
     viewEmpty?: React.ReactNode;
     openState?: boolean;
     labelWidth?: string | number;

package/lib/ProForm/components/render/RenderFields.js

@@ -17,7 +17,7 @@ var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../../../locale"));
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "onDiff", "clearNotShow", "required", "confirm", "desensitization", "span"];
 var RenderFields = function RenderFields(props) {
   var isView = props.isView,
     _props$columns = props.columns,
@@ -83,6 +83,7 @@ var RenderFields = function RenderFields(props) {
       columnRequired = column.required,
       confirm = column.confirm,
       desensitization = column.desensitization,
+      span = column.span,
       otherFormItemProps = (0, _objectWithoutProperties2.default)(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
@@ -177,7 +178,9 @@ var RenderFields = function RenderFields(props) {
     if (!TargetComponent) {
       return [];
     }
-    var _colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultColProps), colProps);
+    var _colProps = span ? {
+      span: span
+    } : (0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultColProps), colProps);
     // 其余参数收进对象里传给子组件 componentProps只包含子组件参数
     var otherProps = {
       label: _formItemProps.label,

package/lib/ProForm/components/render/propsType.d.ts

@@ -182,6 +182,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     }) => React.ReactElement<any, any> | string | undefined | null;
     viewType?: ViewType;
     colProps?: ColProps;
+    /** 列宽占比 */
+    span?: number;
     /** 依赖刷新字段列表 */
     dependNames?: NamePath[];
     /**
@@ -265,6 +267,8 @@ export interface RenderProps<Values = any> {
         disabledStrictly?: boolean;
         [name: string]: any;
     };
+    /** 列宽占比 */
+    span?: number;
     show?: boolean | ((values: Values, { form, index, namePath, }: {
         form: FormInstance<Values>;
         index?: number;

package/lib/ProTable/hooks/useAntdTable.js

@@ -124,8 +124,7 @@ function useAntdTable(service, options, useRequestOptions) {
   }, [extraParams]);
   // 调接口
   var result = (0, _ahooks.useRequest)(service, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-    debounceWait: 300,
-    refreshDeps: [curService, curExtraParams]
+    debounceWait: 300
   }, useRequestOptions), {}, {
     defaultParams: [getTransformParams()],
     onSuccess: function onSuccess(res, params) {
@@ -158,6 +157,14 @@ function useAntdTable(service, options, useRequestOptions) {
       selectedRowKeys: []
     });
   }, []);
+  /**
+   * 手动触发时，手动调用run
+   */
+  (0, _react.useEffect)(function () {
+    if (!(useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual)) {
+      run(getTransformParams());
+    }
+  }, [useRequestOptions === null || useRequestOptions === void 0 ? void 0 : useRequestOptions.manual, curExtraParams, curService]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     if (allSelected) {
       var filterList = data.filter(function (item) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.11.6-beta.7",
+  "version": "3.11.6-beta.9",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",