fan-standard-comp 3.0.13 → 3.0.16

package/lib/FormComp/FieldComponent/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 require("antd/es/slider/style");
 
@@ -63,14 +63,14 @@ var _TitleNode = _interopRequireDefault(require("./TitleNode"));
 
 var _ReUpload = _interopRequireDefault(require("./ReUpload"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var TextArea = _input.default.TextArea,
-    Password = _input.default.Password;
-var Option = _select.default.Option;
-var RangePicker = _datePicker.default.RangePicker; // 表单组件类型
+var TextArea = _input["default"].TextArea,
+    Password = _input["default"].Password;
+var Option = _select["default"].Option;
+var RangePicker = _datePicker["default"].RangePicker; // 表单组件类型
 
-var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
+var FieldComponent = /*#__PURE__*/_react["default"].forwardRef(function (props, ref) {
   var type = props.type,
       _onChange = props.onChange,
       value = props.value,
@@ -146,7 +146,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
 
   switch (type) {
     case 'input':
-      compContent = viewOnly ? value || '-' : /*#__PURE__*/_react.default.createElement(_input.default, Object.assign({
+      compContent = viewOnly ? value || '-' : /*#__PURE__*/_react["default"].createElement(_input["default"], Object.assign({
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请输入',
         autoComplete: "off",
         title: fieldStatus === 'disabled' || defaultProps.disabled ? value : null,
@@ -155,7 +155,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       break;
 
     case 'password':
-      compContent = viewOnly ? value ? "\u25CF\u25CF\u25CF\u25CF\u25CF\u25CF" : '-' : /*#__PURE__*/_react.default.createElement(Password, Object.assign({
+      compContent = viewOnly ? value ? "\u25CF\u25CF\u25CF\u25CF\u25CF\u25CF" : '-' : /*#__PURE__*/_react["default"].createElement(Password, Object.assign({
         autoComplete: "off",
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请输入',
         maxLength: defaultProps.maxLength || 50
@@ -163,7 +163,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       break;
 
     case 'textarea':
-      compContent = viewOnly ? value || '-' : /*#__PURE__*/_react.default.createElement(TextArea, Object.assign({
+      compContent = viewOnly ? value || '-' : /*#__PURE__*/_react["default"].createElement(TextArea, Object.assign({
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请输入',
         maxLength: defaultProps.maxLength || 500,
         title: fieldStatus === 'disabled' || defaultProps.disabled ? value : null
@@ -171,7 +171,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       break;
 
     case 'inputNumber':
-      compContent = viewOnly ? value || 0 : /*#__PURE__*/_react.default.createElement(_inputNumber.default, Object.assign({
+      compContent = viewOnly ? value || 0 : /*#__PURE__*/_react["default"].createElement(_inputNumber["default"], Object.assign({
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请输入数字'
       }, sortLimitRule, defaultProps, {
         style: Object.assign({
@@ -201,7 +201,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         selectOptionRender: selectOptionRender,
         defaultProps: defaultProps,
         type: type
-      }) : /*#__PURE__*/_react.default.createElement(_select.default, Object.assign({
+      }) : /*#__PURE__*/_react["default"].createElement(_select["default"], Object.assign({
         allowClear: true,
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || "".concat(defaultProps.showSearch ? '请输入选择' : '请选择'),
         filterOption: function filterOption(inputValue, option) {
@@ -214,7 +214,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
           return _onChange(value, resetResultOption(Option));
         }
       }), selectOptions.map(function (val) {
-        return /*#__PURE__*/_react.default.createElement(Option, {
+        return /*#__PURE__*/_react["default"].createElement(Option, {
           value: val.value,
           key: val.value,
           title: selectOptionRender ? selectOptionRender(val) : val.title || val.label,
@@ -224,7 +224,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       break;
 
     case 'tree-select':
-      compContent = /*#__PURE__*/_react.default.createElement(_RefactorTreeSelect.default, Object.assign({
+      compContent = /*#__PURE__*/_react["default"].createElement(_RefactorTreeSelect["default"], Object.assign({
         treeData: treeData,
         treeOptionName: treeOptionName,
         allowClear: true,
@@ -244,16 +244,16 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         selectOptionRender: selectOptionRender,
         defaultProps: defaultProps,
         separator: separator
-      }) : /*#__PURE__*/_react.default.createElement(_checkbox.default.Group, Object.assign({}, defaultProps, {
+      }) : /*#__PURE__*/_react["default"].createElement(_checkbox["default"].Group, Object.assign({}, defaultProps, {
         style: Object.assign({
           width: 'auto'
         }, defaultProps.style)
       }), selectOptions && selectOptions.map(function (val) {
-        return /*#__PURE__*/_react.default.createElement(_checkbox.default, {
+        return /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
           value: val.value,
           key: val.value,
           // @ts-ignore
-          title: /*#__PURE__*/_react.default.createElement(_TitleNode.default, {
+          title: /*#__PURE__*/_react["default"].createElement(_TitleNode["default"], {
             render: selectOptionRender,
             data: val
           }),
@@ -269,17 +269,17 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         selectOptions: selectOptions,
         selectOptionRender: selectOptionRender,
         defaultProps: defaultProps
-      }) : /*#__PURE__*/_react.default.createElement(_radio.default.Group, Object.assign({}, defaultProps, {
+      }) : /*#__PURE__*/_react["default"].createElement(_radio["default"].Group, Object.assign({}, defaultProps, {
         style: Object.assign({
           width: 'auto'
         }, defaultProps.style)
       }), selectOptions && selectOptions.map(function (val) {
         if (defaultProps.optionType === 'button') {
-          return /*#__PURE__*/_react.default.createElement(_radio.default.Button, {
+          return /*#__PURE__*/_react["default"].createElement(_radio["default"].Button, {
             value: val.value,
             key: val.value,
             // @ts-ignore
-            title: /*#__PURE__*/_react.default.createElement(_TitleNode.default, {
+            title: /*#__PURE__*/_react["default"].createElement(_TitleNode["default"], {
               render: selectOptionRender,
               data: val
             }),
@@ -287,11 +287,11 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
           }, selectOptionRender ? selectOptionRender(val) : val.label);
         }
 
-        return /*#__PURE__*/_react.default.createElement(_radio.default, {
+        return /*#__PURE__*/_react["default"].createElement(_radio["default"], {
           value: val.value,
           key: val.value,
           // @ts-ignore
-          title: /*#__PURE__*/_react.default.createElement(_TitleNode.default, {
+          title: /*#__PURE__*/_react["default"].createElement(_TitleNode["default"], {
             render: selectOptionRender,
             data: val
           }),
@@ -306,7 +306,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       compContent = viewOnly ? (0, _setReadonlyValues.setDatePickerValue)(value, {
         type: type,
         protoConfig: protoConfig
-      }) : /*#__PURE__*/_react.default.createElement(_datePicker.default, Object.assign({
+      }) : /*#__PURE__*/_react["default"].createElement(_datePicker["default"], Object.assign({
         showTime: defaultProps.showTime || type === 'dateTimePicker',
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请选择'
       }, defaultProps, {
@@ -323,7 +323,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       compContent = viewOnly ? (0, _setReadonlyValues.setDatePickerValue)(value, {
         type: type,
         protoConfig: protoConfig
-      }) : /*#__PURE__*/_react.default.createElement(RangePicker, Object.assign({
+      }) : /*#__PURE__*/_react["default"].createElement(RangePicker, Object.assign({
         showTime: defaultProps.showTime || type === 'rangeTimePicker'
       }, defaultProps, {
         style: Object.assign({
@@ -338,7 +338,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       compContent = viewOnly ? (0, _setReadonlyValues.setTimePickerValue)(value, {
         type: type,
         protoConfig: protoConfig
-      }) : /*#__PURE__*/_react.default.createElement(_timePicker.default, Object.assign({}, defaultProps, {
+      }) : /*#__PURE__*/_react["default"].createElement(_timePicker["default"], Object.assign({}, defaultProps, {
         style: Object.assign(Object.assign({
           'minWidth': 'auto'
         }, defaultProps.style), {
@@ -354,7 +354,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       compContent = viewOnly ? (0, _setReadonlyValues.setTimePickerValue)(value, {
         type: type,
         protoConfig: protoConfig
-      }) : /*#__PURE__*/_react.default.createElement(_timePicker.default.RangePicker, Object.assign({}, defaultProps, {
+      }) : /*#__PURE__*/_react["default"].createElement(_timePicker["default"].RangePicker, Object.assign({}, defaultProps, {
         style: Object.assign(Object.assign({
           'minWidth': 'auto'
         }, defaultProps.style), {
@@ -364,22 +364,22 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       break;
 
     case 'upload':
-      compContent = viewOnly && (!value || value.length === 0) ? '-' : /*#__PURE__*/_react.default.createElement(_ReUpload.default, Object.assign({}, defaultProps, {
+      compContent = viewOnly && (!value || value.length === 0) ? '-' : /*#__PURE__*/_react["default"].createElement(_ReUpload["default"], Object.assign({}, defaultProps, {
         viewOnly: viewOnly,
         disabled: viewOnly || fieldStatus === 'disabled' || defaultProps.disabled
-      }), defaultProps.children ? defaultProps.children : defaultProps.fileList && defaultProps.fileList.length >= 1 || defaultProps.defaultFileList && defaultProps.defaultFileList.length >= 1 ? null : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, defaultProps.listType === 'picture-card' ? /*#__PURE__*/_react.default.createElement("div", {
+      }), defaultProps.children ? defaultProps.children : defaultProps.fileList && defaultProps.fileList.length >= 1 || defaultProps.defaultFileList && defaultProps.defaultFileList.length >= 1 ? null : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, defaultProps.listType === 'picture-card' ? /*#__PURE__*/_react["default"].createElement("div", {
         className: 'spec-uploader-control'
-      }, /*#__PURE__*/_react.default.createElement(_SpecIcon.default, {
+      }, /*#__PURE__*/_react["default"].createElement(_SpecIcon["default"], {
         name: "plus"
-      }), /*#__PURE__*/_react.default.createElement("div", {
+      }), /*#__PURE__*/_react["default"].createElement("div", {
         className: "ant-upload-text"
-      }, "\u70B9\u51FB\u9009\u62E9")) : /*#__PURE__*/_react.default.createElement(_button.default, null, /*#__PURE__*/_react.default.createElement(_SpecIcon.default, {
+      }, "\u70B9\u51FB\u9009\u62E9")) : /*#__PURE__*/_react["default"].createElement(_button["default"], null, /*#__PURE__*/_react["default"].createElement(_SpecIcon["default"], {
         name: "upload"
       }), " \u70B9\u51FB\u4E0A\u4F20")));
       break;
 
     case 'uploader':
-      compContent = viewOnly ? (0, _setReadonlyValues.setUploaderValue)(value) : /*#__PURE__*/_react.default.createElement(_Uploader.default, Object.assign({}, defaultProps, {
+      compContent = viewOnly ? (0, _setReadonlyValues.setUploaderValue)(value) : /*#__PURE__*/_react["default"].createElement(_Uploader["default"], Object.assign({}, defaultProps, {
         size: protoConfig === null || protoConfig === void 0 ? void 0 : protoConfig.size
       })); // compContent = <Uploader {...defaultProps}></Uploader>
 
@@ -390,7 +390,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         selectOptions: selectOptions,
         selectOptionRender: selectOptionRender,
         defaultProps: defaultProps
-      }) : /*#__PURE__*/_react.default.createElement(_cascader.default, Object.assign({
+      }) : /*#__PURE__*/_react["default"].createElement(_cascader["default"], Object.assign({
         options: selectOptions,
         allowClear: true,
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请选择'
@@ -398,7 +398,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       break;
 
     case 'switch':
-      compContent = /*#__PURE__*/_react.default.createElement(_switch.default, Object.assign({}, defaultProps, {
+      compContent = /*#__PURE__*/_react["default"].createElement(_switch["default"], Object.assign({}, defaultProps, {
         disabled: viewOnly || defaultProps.disabled,
         checked: value,
         style: Object.assign(Object.assign({}, defaultProps.style), {
@@ -409,7 +409,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       break;
 
     case 'slider':
-      compContent = viewOnly ? value : /*#__PURE__*/_react.default.createElement(_slider.default, Object.assign({}, defaultProps, {
+      compContent = viewOnly ? value : /*#__PURE__*/_react["default"].createElement(_slider["default"], Object.assign({}, defaultProps, {
         style: Object.assign({}, defaultProps.style)
       }));
       break;
@@ -427,4 +427,4 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
 });
 
 var _default = FieldComponent;
-exports.default = _default;
+exports["default"] = _default;

package/lib/FormComp/FieldComponent/setReadonlyValues.js

@@ -19,9 +19,9 @@ var _util = require("../Uploader/util");
 
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -98,7 +98,7 @@ var setSelectValue = function setSelectValue(value, props) {
       if (matchValue.length > 0) {
         // 如果 select 配置选项展示内容，则直接使用其配置值展示当前只读信息
         if (selectOptionRender) {
-          matchValues.push( /*#__PURE__*/_react.default.createElement("div", {
+          matchValues.push( /*#__PURE__*/_react["default"].createElement("div", {
             key: index,
             className: "checkbox-viewonly-item"
           }, selectOptionRender(matchValue[0]), value.length - 1 > index ? separator ? separator : separator === null ? '' : ',' : ''));
@@ -109,7 +109,7 @@ var setSelectValue = function setSelectValue(value, props) {
     }); // 如果 select 配置选项展示内容，则直接使用其配置值展示当前只读信息
 
     if (selectOptionRender) {
-      return /*#__PURE__*/_react.default.createElement("div", {
+      return /*#__PURE__*/_react["default"].createElement("div", {
         className: "checkbox-viewonly-list"
       }, matchValues);
     }
@@ -140,23 +140,23 @@ var setDatePickerValue = function setDatePickerValue(value, props) {
 
   switch (type) {
     case 'datePicker':
-      return (0, _moment.default)(value).format(protoConfig && protoConfig.format || 'YYYY-MM-DD');
+      return (0, _moment["default"])(value).format(protoConfig && protoConfig.format || 'YYYY-MM-DD');
       break;
 
     case 'dateTimePicker':
-      return (0, _moment.default)(value).format(protoConfig && protoConfig.format || 'YYYY-MM-DD HH:mm:ss');
+      return (0, _moment["default"])(value).format(protoConfig && protoConfig.format || 'YYYY-MM-DD HH:mm:ss');
       break;
 
     case 'rangePicker':
-      return "".concat((0, _moment.default)(value[0]).format(protoConfig && protoConfig.format || 'YYYY-MM-DD'), " - ").concat((0, _moment.default)(value[1]).format(protoConfig && protoConfig.format || 'YYYY-MM-DD'));
+      return "".concat((0, _moment["default"])(value[0]).format(protoConfig && protoConfig.format || 'YYYY-MM-DD'), " - ").concat((0, _moment["default"])(value[1]).format(protoConfig && protoConfig.format || 'YYYY-MM-DD'));
       break;
 
     case 'rangeTimePicker':
-      return "".concat((0, _moment.default)(value[0]).format(protoConfig && protoConfig.format || 'YYYY-MM-DD  HH:mm:ss'), " - ").concat((0, _moment.default)(value[1]).format(protoConfig && protoConfig.format || 'YYYY-MM-DD  HH:mm:ss'));
+      return "".concat((0, _moment["default"])(value[0]).format(protoConfig && protoConfig.format || 'YYYY-MM-DD  HH:mm:ss'), " - ").concat((0, _moment["default"])(value[1]).format(protoConfig && protoConfig.format || 'YYYY-MM-DD  HH:mm:ss'));
       break;
 
     case 'monthPicker':
-      return (0, _moment.default)(value).format(protoConfig && protoConfig.format || 'MM月');
+      return (0, _moment["default"])(value).format(protoConfig && protoConfig.format || 'MM月');
       break;
 
     default:
@@ -175,11 +175,11 @@ var setTimePickerValue = function setTimePickerValue(value, props) {
 
   switch (type) {
     case 'timePicker':
-      return (0, _moment.default)(value).format(protoConfig && protoConfig.format || 'HH:mm:ss');
+      return (0, _moment["default"])(value).format(protoConfig && protoConfig.format || 'HH:mm:ss');
       break;
 
     case 'timePickerRange':
-      return "".concat((0, _moment.default)(value[0]).format(protoConfig && protoConfig.format || 'HH:mm:ss'), " - ").concat((0, _moment.default)(value[1]).format(protoConfig && protoConfig.format || 'HH:mm:ss'));
+      return "".concat((0, _moment["default"])(value[0]).format(protoConfig && protoConfig.format || 'HH:mm:ss'), " - ").concat((0, _moment["default"])(value[1]).format(protoConfig && protoConfig.format || 'HH:mm:ss'));
       break;
 
     default:
@@ -221,10 +221,10 @@ var setUploaderValue = function setUploaderValue(value, props) {
         }
       });
     }, [value]);
-    return /*#__PURE__*/_react.default.createElement("div", {
+    return /*#__PURE__*/_react["default"].createElement("div", {
       className: 'spec-uploader-viewonly'
-    }, /*#__PURE__*/_react.default.createElement(_image.default.PreviewGroup, null, previews && (previews === null || previews === void 0 ? void 0 : previews.map(function (item, index) {
-      return (item === null || item === void 0 ? void 0 : item.url) ? /*#__PURE__*/_react.default.createElement(_image.default, {
+    }, /*#__PURE__*/_react["default"].createElement(_image["default"].PreviewGroup, null, previews && (previews === null || previews === void 0 ? void 0 : previews.map(function (item, index) {
+      return (item === null || item === void 0 ? void 0 : item.url) ? /*#__PURE__*/_react["default"].createElement(_image["default"], {
         key: index,
         width: 100,
         height: 100,
@@ -232,7 +232,7 @@ var setUploaderValue = function setUploaderValue(value, props) {
           objectFit: 'contain'
         },
         src: item.url
-      }) : /*#__PURE__*/_react.default.createElement("div", {
+      }) : /*#__PURE__*/_react["default"].createElement("div", {
         key: index,
         className: "spec-uploader-viewonly-item"
       }, "\u6682\u65E0\u56FE\u7247");
@@ -248,9 +248,9 @@ var setUploaderValue = function setUploaderValue(value, props) {
         setPreview(result);
       });
     }, [value]);
-    return /*#__PURE__*/_react.default.createElement("div", {
+    return /*#__PURE__*/_react["default"].createElement("div", {
       className: "spec-uploader-viewonly"
-    }, preview ? /*#__PURE__*/_react.default.createElement(_image.default, {
+    }, preview ? /*#__PURE__*/_react["default"].createElement(_image["default"], {
       style: {
         objectFit: 'contain'
       },

package/lib/FormComp/RenderItemGroup/index.d.ts

@@ -15,12 +15,20 @@ export interface FieldsItemProps extends FieldComponentProps {
     size?: 'large' | 'middle' | 'small' | string;
     componentStyle?: React.CSSProperties;
 }
+interface layoutProps {
+    labelCol?: any;
+    wrapperCol?: any;
+}
+interface displayLayoutProps extends layoutProps {
+    side?: layoutProps;
+    block?: layoutProps;
+}
 interface ItemGroupProps {
     itemGroup: any | FieldsItemProps[];
     size?: string;
     fieldStatus?: 'default' | 'viewOnly' | 'disabled';
     fieldSize?: 'large' | 'middle' | 'small' | any;
-    displayLayout?: object;
+    displayLayout?: displayLayoutProps;
     form?: any;
     layout?: string;
     doUpdateFormFields?: () => void;

package/lib/FormComp/RenderItemGroup/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 
 require("antd/es/row/style");
 
@@ -29,11 +29,11 @@ var _FieldComponent = _interopRequireDefault(require("../FieldComponent"));
 
 var _SpecIcon = _interopRequireDefault(require("../../SpecIcon"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
-var FormItem = _form.default.Item;
+var FormItem = _form["default"].Item;
 
 var RenderItemGroup = function RenderItemGroup(props) {
   var itemGroup = props.itemGroup,
@@ -86,11 +86,11 @@ var RenderItemGroup = function RenderItemGroup(props) {
     // 带前缀或后缀控件渲染
 
     if (preExtra || extra) {
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, preExtra ? preExtra(field, form) : '', /*#__PURE__*/_react.default.createElement(FormItem, {
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, preExtra ? preExtra(field, form) : '', /*#__PURE__*/_react["default"].createElement(FormItem, {
         noStyle: true,
         rules: field.rules || (field.fieldOptions ? field.fieldOptions.rules : []),
         name: field.filedName
-      }, /*#__PURE__*/_react.default.createElement(_FieldComponent.default, Object.assign({}, field, {
+      }, /*#__PURE__*/_react["default"].createElement(_FieldComponent["default"], Object.assign({}, field, {
         onChange: function onChange(eOrValue) {
           updateFormFields();
 
@@ -105,7 +105,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
         style: componentStyle || Object.assign({}, _data.general.formItemStyle.wide)
       }))), extra ? extra(field, form) : '');
     } else {
-      return /*#__PURE__*/_react.default.createElement(_FieldComponent.default, Object.assign({}, field, {
+      return /*#__PURE__*/_react["default"].createElement(_FieldComponent["default"], Object.assign({}, field, {
         onChange: function onChange(eOrValue) {
           // let updateValue = val
           // if (field.type === 'input' || field.type === 'textarea' || field.type === 'radio' || field.type === 'password') {
@@ -135,15 +135,15 @@ var RenderItemGroup = function RenderItemGroup(props) {
         filedName = item.filedName; // 当前可传参的配置值
 
     if (layout === "horizontal") {
-      return /*#__PURE__*/_react.default.createElement(_col.default, {
+      return /*#__PURE__*/_react["default"].createElement(_col["default"], {
         key: index,
         span: item.colSpan || setColSpan(item.display, size)
-      }, /*#__PURE__*/_react.default.createElement(FormItem, Object.assign({
+      }, /*#__PURE__*/_react["default"].createElement(FormItem, Object.assign({
         name: type !== 'custom' && filedName,
         className: fieldStatus === 'viewOnly' ? 'form-item-view-only' : '',
-        label: description ? /*#__PURE__*/_react.default.createElement("span", null, label, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+        label: description ? /*#__PURE__*/_react["default"].createElement("span", null, label, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
           title: description
-        }, /*#__PURE__*/_react.default.createElement(_SpecIcon.default, {
+        }, /*#__PURE__*/_react["default"].createElement(_SpecIcon["default"], {
           name: "info"
         }))) : label,
         rules: item.preExtra || item.extra ? [] : item.rules || (item.fieldOptions ? item.fieldOptions.rules : []),
@@ -152,13 +152,13 @@ var RenderItemGroup = function RenderItemGroup(props) {
         }).length > 0
       }, formLayout, item.protoFormItem), type === 'custom' && customRender ? customRender(form, Object.assign({}, item), fieldStatus) : renderFormField(Object.assign({}, item))));
     } else {
-      return /*#__PURE__*/_react.default.createElement(FormItem, Object.assign({
+      return /*#__PURE__*/_react["default"].createElement(FormItem, Object.assign({
         key: index,
         name: type !== 'custom' && filedName,
         className: fieldStatus === 'viewOnly' ? 'form-item-view-only' : '',
-        label: description ? /*#__PURE__*/_react.default.createElement("span", null, label, /*#__PURE__*/_react.default.createElement(_tooltip.default, {
+        label: description ? /*#__PURE__*/_react["default"].createElement("span", null, label, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
           title: description
-        }, /*#__PURE__*/_react.default.createElement(_SpecIcon.default, {
+        }, /*#__PURE__*/_react["default"].createElement(_SpecIcon["default"], {
           name: "info"
         }))) : label,
         rules: item.rules || (item.fieldOptions ? item.fieldOptions.rules : [])
@@ -179,14 +179,20 @@ var RenderItemGroup = function RenderItemGroup(props) {
       //   // 如果未配置，则使用以下配置值
       //   formLayout = { ...displayLayout }
       // }
+      // 优先级 displayLayout.side > displayLayout > general
+      // 优先级：若有displayLayout.block 则直接使用 general > displayLayout
 
-      formLayout = displayLayout || _data.general.modalSize[size].formLayout;
+      formLayout = (displayLayout === null || displayLayout === void 0 ? void 0 : displayLayout.side) || ((displayLayout === null || displayLayout === void 0 ? void 0 : displayLayout.block) ? _data.general.modalSize[size].formLayout : !displayLayout || JSON.stringify(displayLayout) === '{}' ? _data.general.modalSize[size].formLayout : displayLayout);
 
       if (item.hasOwnProperty('display')) {
         if (typeof display === 'string') {
-          formLayout = display === 'block' ? _data.general.modalSize[size].formBlockLayout : _data.general.modalSize[size].formLayout;
+          if (display === 'block') {
+            formLayout = (displayLayout === null || displayLayout === void 0 ? void 0 : displayLayout.block) || _data.general.modalSize[size].formBlockLayout;
+          } else {// 使用默认
+            // formLayout = displayLayout?.side || (displayLayout?.block ? general.modalSize[size].formLayout : displayLayout) || general.modalSize[size].formLayout
+          }
         } else {
-          formLayout = item.display; // 对象类型传值如： {labelCol: {span: 3},wrapperCol: {span: 8}}
+          formLayout = item.display; // 对象类型传值如： {labelCol: {span: 3},wrapperCol: {span: 8}} 优先级最高
         }
       } // 当布局为 'vertical'或'inline'时，不配置栅格结构
 
@@ -197,7 +203,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
 
 
       if (type === 'title' || type === 'html') {
-        return /*#__PURE__*/_react.default.createElement(FormItem, {
+        return /*#__PURE__*/_react["default"].createElement(FormItem, {
           key: index,
           noStyle: true,
           shouldUpdate: true
@@ -205,18 +211,18 @@ var RenderItemGroup = function RenderItemGroup(props) {
           var _a; // isHide 返回为true则隐藏当前控件
 
 
-          return !itemIsHide(isHide, FormInstance.getFieldValue(), FormInstance) ? /*#__PURE__*/_react.default.createElement(_col.default, {
+          return !itemIsHide(isHide, FormInstance.getFieldValue(), FormInstance) ? /*#__PURE__*/_react["default"].createElement(_col["default"], {
             span: item.colSpan || 24
-          }, type === 'title' ? /*#__PURE__*/_react.default.createElement("h3", Object.assign({
+          }, type === 'title' ? /*#__PURE__*/_react["default"].createElement("h3", Object.assign({
             className: "modalPanelTitle ".concat((_a = item === null || item === void 0 ? void 0 : item.protoConfig) === null || _a === void 0 ? void 0 : _a.className)
-          }, item.protoConfig), label) : label) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, null);
+          }, item.protoConfig), label) : label) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, null);
         });
-        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, null);
+        return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, null);
       } // 判断是否强制重新渲染表单
 
 
       if (item.protoFormItem && item.protoFormItem.shouldUpdate) {
-        return /*#__PURE__*/_react.default.createElement(FormItem, {
+        return /*#__PURE__*/_react["default"].createElement(FormItem, {
           key: index,
           noStyle: true,
           shouldUpdate: item.protoFormItem.shouldUpdate
@@ -238,7 +244,7 @@ var RenderItemGroup = function RenderItemGroup(props) {
     } // 布局配置为horizontal
 
 
-    return /*#__PURE__*/_react.default.createElement(_row.default, null, renderItemGroupNode());
+    return /*#__PURE__*/_react["default"].createElement(_row["default"], null, renderItemGroupNode());
   }
   /* itemGroup = ReactNode则直接返回 */
 
@@ -247,4 +253,4 @@ var RenderItemGroup = function RenderItemGroup(props) {
 };
 
 var _default = RenderItemGroup;
-exports.default = _default;
+exports["default"] = _default;