@zat-design/sisyphus-react 3.11.6-beta.6 → 3.11.6-beta.8

package/es/ProForm/components/combination/ProRangeLimit/index.d.ts

@@ -13,6 +13,10 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
     isView?: boolean;
     showTime?: any;
     valueType?: any;
+    /**
+     * 是否限制时间范围
+     */
+    limit?: boolean;
 };
 type Value = [Moment?, Moment?, boolean?] | null;
 type ValueStr = [string?, string?, string?] | null;

package/es/ProForm/components/combination/ProRangeLimit/index.js

@@ -8,7 +8,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator"];
+var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator", "limit"];
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useMemo, useState } from 'react';
 import { omit, isFunction, uniq, isObject } from 'lodash';
@@ -57,6 +57,8 @@ var ProRangeLimit = function ProRangeLimit(props) {
     otherProps = props.otherProps,
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '~' : _props$separator,
+    _props$limit = props.limit,
+    limit = _props$limit === void 0 ? true : _props$limit,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref = ProForm.useFieldProps() || {},
     isViewCon = _ref.isView,
@@ -174,7 +176,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
       format: _format,
       value: value,
       onChange: handleRangeChange
-    })), _jsx("div", {
+    })), limit && _jsx("div", {
       className: className,
       children: _jsx(_Checkbox, {
         checked: _isForever,

package/es/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -18,6 +18,10 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
     otherProps?: ProFormOtherProps;
     mode?: 'DatePicker';
     isView?: boolean;
+    /**
+     * 是否限制时间范围
+     */
+    limit?: boolean;
 } & TimePickerProps & {
     showTime?: PickerPanelDateProps<Moment>['showTime'];
     showNow?: boolean;

package/es/ProForm/components/combination/ProTimeLimit/index.js

@@ -8,7 +8,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps"],
+var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps", "limit"],
   _excluded2 = ["mode"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
@@ -33,6 +33,8 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     _props$valueType = props.valueType,
     valueType = _props$valueType === void 0 ? 'format' : _props$valueType,
     otherProps = props.otherProps,
+    _props$limit = props.limit,
+    limit = _props$limit === void 0 ? true : _props$limit,
     rest = _objectWithoutProperties(props, _excluded);
   var _ref = ProForm.useFieldProps() || {},
     isViewCon = _ref.isView,
@@ -129,7 +131,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
       format: _format,
       value: value,
       onChange: onChange
-    })), _jsx("div", {
+    })), limit && _jsx("div", {
       className: className,
       children: _jsx(_Checkbox, {
         checked: isForever,

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/lib/ProForm/components/combination/ProRangeLimit/index.d.ts

@@ -13,6 +13,10 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
     isView?: boolean;
     showTime?: any;
     valueType?: any;
+    /**
+     * 是否限制时间范围
+     */
+    limit?: boolean;
 };
 type Value = [Moment?, Moment?, boolean?] | null;
 type ValueStr = [string?, string?, string?] | null;

package/lib/ProForm/components/combination/ProRangeLimit/index.js

@@ -19,7 +19,7 @@ var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
-var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator"];
+var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator", "limit"];
 var defaultPickerValue = [(0, _moment.default)(), (0, _moment.default)()];
 var useControlled = function useControlled(props) {
   var _useState = (0, _react.useState)(),
@@ -59,6 +59,8 @@ var ProRangeLimit = function ProRangeLimit(props) {
     otherProps = props.otherProps,
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '~' : _props$separator,
+    _props$limit = props.limit,
+    limit = _props$limit === void 0 ? true : _props$limit,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = _ProForm.default.useFieldProps() || {},
     isViewCon = _ref.isView,
@@ -176,7 +178,7 @@ var ProRangeLimit = function ProRangeLimit(props) {
       format: _format,
       value: value,
       onChange: handleRangeChange
-    })), (0, _jsxRuntime.jsx)("div", {
+    })), limit && (0, _jsxRuntime.jsx)("div", {
       className: className,
       children: (0, _jsxRuntime.jsx)(_antd.Checkbox, {
         checked: _isForever,

package/lib/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -18,6 +18,10 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
     otherProps?: ProFormOtherProps;
     mode?: 'DatePicker';
     isView?: boolean;
+    /**
+     * 是否限制时间范围
+     */
+    limit?: boolean;
 } & TimePickerProps & {
     showTime?: PickerPanelDateProps<Moment>['showTime'];
     showNow?: boolean;

package/lib/ProForm/components/combination/ProTimeLimit/index.js

@@ -21,7 +21,7 @@ var _useControlled3 = _interopRequireDefault(require("./hooks/useControlled"));
 var _ProRangeLimit = _interopRequireDefault(require("../ProRangeLimit"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
-var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps"],
+var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps", "limit"],
   _excluded2 = ["mode"];
 // 永久有效默认值
 var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
@@ -35,6 +35,8 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
     _props$valueType = props.valueType,
     valueType = _props$valueType === void 0 ? 'format' : _props$valueType,
     otherProps = props.otherProps,
+    _props$limit = props.limit,
+    limit = _props$limit === void 0 ? true : _props$limit,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = _ProForm.default.useFieldProps() || {},
     isViewCon = _ref.isView,
@@ -131,7 +133,7 @@ var ProTimeLimit = exports.ProTimeLimit = function ProTimeLimit(props) {
       format: _format,
       value: value,
       onChange: onChange
-    })), (0, _jsxRuntime.jsx)("div", {
+    })), limit && (0, _jsxRuntime.jsx)("div", {
       className: className,
       children: (0, _jsxRuntime.jsx)(_antd.Checkbox, {
         checked: isForever,

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/package.json

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