fan-standard-comp 3.1.6 → 3.1.7

package/es/FormComp/FieldComponent/ReUpload.js

@@ -36,7 +36,9 @@ var ReUpload = /*#__PURE__*/React.forwardRef(function (deProps, ref) {
   var viewOnly = deProps.viewOnly,
       onChange = deProps.onChange,
       value = deProps.value,
-      otherProps = __rest(deProps, ["viewOnly", "onChange", "value"]);
+      _deProps$modalConfig = deProps.modalConfig,
+      modalConfig = _deProps$modalConfig === void 0 ? {} : _deProps$modalConfig,
+      otherProps = __rest(deProps, ["viewOnly", "onChange", "value", "modalConfig"]);
 
   var _useState = useState(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -106,7 +108,7 @@ var ReUpload = /*#__PURE__*/React.forwardRef(function (deProps, ref) {
     onChange: uploadChange,
     ref: ref,
     className: viewOnly ? 'upload-viewonly' : ''
-  })), /*#__PURE__*/React.createElement(StandardModal, {
+  })), /*#__PURE__*/React.createElement(StandardModal, Object.assign({
     visible: previewConfig.previewVisible,
     hideFooter: true,
     onCancel: function onCancel() {
@@ -115,8 +117,9 @@ var ReUpload = /*#__PURE__*/React.forwardRef(function (deProps, ref) {
         previewImage: '',
         previewTitle: ''
       });
-    }
-  }, /*#__PURE__*/React.createElement("div", {
+    },
+    zIndex: 2000
+  }, modalConfig), /*#__PURE__*/React.createElement("div", {
     style: {
       textAlign: 'center'
     }

package/es/FormComp/FieldComponent/index.js

@@ -53,7 +53,6 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
     disabled: 'disabled',
     title: 'title'
   } : _props$selectOptionNa,
-      fieldNames = props.fieldNames,
       _props$treeOptionName = props.treeOptionName,
       treeOptionName = _props$treeOptionName === void 0 ? {
     title: 'title',
@@ -180,7 +179,7 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
         onChange: function onChange(value, Option) {
           return _onChange(value, resetResultOption(Option));
         }
-      }), fieldNames ? null : selectOptions.map(function (val, index) {
+      }), (defaultProps === null || defaultProps === void 0 ? void 0 : defaultProps.fieldNames) ? null : (selectOptions || []).map(function (val, index) {
         return /*#__PURE__*/React.createElement(Option, {
           value: val.value,
           key: val.value || index,
@@ -360,7 +359,7 @@ var FieldComponent = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }) : /*#__PURE__*/React.createElement(_Cascader, Object.assign({
         options: selectOptions,
         allowClear: true,
-        fieldNames: fieldNames || selectOptionName,
+        fieldNames: (defaultProps === null || defaultProps === void 0 ? void 0 : defaultProps.fieldNames) || selectOptionName,
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请选择'
       }, defaultProps));
       break;

package/es/FormComp/Uploader/index.js

@@ -219,7 +219,8 @@ var Uploader = /*#__PURE__*/React.forwardRef(function (props, ref) {
             url: ''
           });
         },
-        size: modalSize
+        size: modalSize,
+        zIndex: 2000
       }, modalConfig), /*#__PURE__*/React.createElement("div", {
         style: {
           textAlign: 'center'

package/es/StandardFilter/index.d.ts

@@ -26,6 +26,7 @@ declare class StandardFilter extends React.Component<StandardFilterProps, any> {
     componentDidMount(): void;
     componentDidUpdate(prevProps: StandardFilterProps): void;
     updateFormFields: (newVal?: any, force?: boolean) => void;
+    forceUpdateForm: () => void;
     handleSearch: (values: object) => void;
     handleReset: () => void;
     itemIsHide: (isHide: any) => any;

package/es/StandardFilter/index.js

@@ -5,20 +5,6 @@ import _Button from "antd/es/button";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 
-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; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -40,11 +26,11 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 import React from 'react';
-import FieldComponent from '../FormComp/FieldComponent';
 import UtilValueFormat from '../utils/ValueFormat.js';
-import ButtonGroup from '../ButtonGroup/index';
-import { general } from '../data/index';
+import ButtonGroup from '../ButtonGroup/index'; // import { general } from '../data/index';
+
 import './style/index.less';
+import RenderItemGroup from '../FormComp/RenderItemGroup';
 var FormItem = _Form.Item;
 
 var StandardFilter = /*#__PURE__*/function (_React$Component) {
@@ -76,6 +62,12 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
       _this.filterFormRef.current.setFieldsValue(Object.assign(Object.assign({}, resetValues), newVal)); // 直接清空表单的赋值
 
 
+      if (getFormFields) getFormFields(_this.filterFormRef.current.getFieldsValue(), _this.filterFormRef);
+    }; // 强制更新表单值，用于赋初始化实例值
+
+
+    _this.forceUpdateForm = function () {
+      var getFormFields = _this.props.getFormFields;
       if (getFormFields) getFormFields(_this.filterFormRef.current.getFieldsValue(), _this.filterFormRef);
     };
 
@@ -129,40 +121,47 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
       var reFormItemGroup = _this.state.reFormItemGroup;
 
       if (Array.isArray(reFormItemGroup)) {
-        return /*#__PURE__*/React.createElement(React.Fragment, null, reFormItemGroup.map(function (item, index) {
-          var componentStyle = item.componentStyle,
-              isHide = item.isHide;
-          if (_this.itemIsHide(isHide)) return null;
-          return /*#__PURE__*/React.createElement(FormItem, Object.assign({
-            key: item.filedName,
-            label: item.label,
-            name: item.type !== 'custom' && item.filedName,
-            rules: item.rules || (item.fieldOptions ? item.fieldOptions.rules : [])
-          }, item.protoFormItem), item.type === 'custom' && item.customRender ? item.customRender(_this.filterFormRef, Object.assign({}, item)) : /*#__PURE__*/React.createElement(FieldComponent, Object.assign({}, item, {
-            onChange: function onChange(val) {
-              var updateValue = val;
-
-              if (item.type === 'input' || item.type === 'textarea' || item.type === 'radio') {
-                updateValue = val.target.value;
-              }
-
-              if (Array.isArray(val)) {
-                updateValue = _toConsumableArray(val);
-              }
-
-              _this.updateFormFields(_defineProperty({}, item.filedName, updateValue));
-
-              for (var _len = arguments.length, otherParams = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-                otherParams[_key - 1] = arguments[_key];
-              }
-
-              if (item.onChange) item.onChange.apply(item, [val, _this.filterFormRef].concat(otherParams));
-            },
-            style: Object.assign({
-              width: item.type === 'checkbox' || item.type === 'radio' ? 'auto' : general.formItemStyle.xsm.width
-            }, componentStyle)
-          })));
-        }));
+        return /*#__PURE__*/React.createElement(RenderItemGroup, {
+          itemGroup: reFormItemGroup,
+          layout: "inline",
+          form: _this.filterFormRef,
+          // fieldSize={fieldSize}
+          // displayLayout={displayLayout}
+          doUpdateFormFields: function doUpdateFormFields() {
+            return _this.forceUpdateForm();
+          }
+        });
+        /* return <>
+           {
+             reFormItemGroup.map((item, index) => {
+               const { componentStyle, isHide } = item
+               if (this.itemIsHide(isHide)) return null
+               return (
+                 <FormItem key={item.filedName} label={item.label}
+                           name={item.type !== 'custom' && item.filedName}
+                           rules={item.rules || (item.fieldOptions ? item.fieldOptions.rules : [])}
+                           {...item.protoFormItem}>
+                   {
+                     (item.type === 'custom' && item.customRender) ? item.customRender(this.filterFormRef, { ...item }) :
+                       <FieldComponent {...item}
+                                       onChange={(val, ...otherParams) => {
+                                         let updateValue = val
+                                         if (item.type === 'input' || item.type === 'textarea' || item.type === 'radio') {
+                                           updateValue = val.target.value
+                                         }
+                                         if (Array.isArray(val)) {
+                                           updateValue = [...val]
+                                         }
+                                         this.updateFormFields({ [item.filedName]: updateValue })
+                                         if (item.onChange) item.onChange(val, this.filterFormRef, ...otherParams)
+                                       }}
+                                       style={{ width: item.type === 'checkbox' || item.type === 'radio' ? 'auto' : general.formItemStyle.xsm.width, ...componentStyle }}/>
+                   }
+                 </FormItem>
+               )
+             })
+           }
+         </>*/
       }
 
       return reFormItemGroup;

package/lib/FormComp/FieldComponent/ReUpload.js

@@ -54,7 +54,9 @@ var ReUpload = /*#__PURE__*/_react.default.forwardRef(function (deProps, ref) {
   var viewOnly = deProps.viewOnly,
       onChange = deProps.onChange,
       value = deProps.value,
-      otherProps = (0, _tslib.__rest)(deProps, ["viewOnly", "onChange", "value"]);
+      _deProps$modalConfig = deProps.modalConfig,
+      modalConfig = _deProps$modalConfig === void 0 ? {} : _deProps$modalConfig,
+      otherProps = (0, _tslib.__rest)(deProps, ["viewOnly", "onChange", "value", "modalConfig"]);
 
   var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -124,7 +126,7 @@ var ReUpload = /*#__PURE__*/_react.default.forwardRef(function (deProps, ref) {
     onChange: uploadChange,
     ref: ref,
     className: viewOnly ? 'upload-viewonly' : ''
-  })), /*#__PURE__*/_react.default.createElement(_index.default, {
+  })), /*#__PURE__*/_react.default.createElement(_index.default, Object.assign({
     visible: previewConfig.previewVisible,
     hideFooter: true,
     onCancel: function onCancel() {
@@ -133,8 +135,9 @@ var ReUpload = /*#__PURE__*/_react.default.forwardRef(function (deProps, ref) {
         previewImage: '',
         previewTitle: ''
       });
-    }
-  }, /*#__PURE__*/_react.default.createElement("div", {
+    },
+    zIndex: 2000
+  }, modalConfig), /*#__PURE__*/_react.default.createElement("div", {
     style: {
       textAlign: 'center'
     }

package/lib/FormComp/FieldComponent/index.js

@@ -95,7 +95,6 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     disabled: 'disabled',
     title: 'title'
   } : _props$selectOptionNa,
-      fieldNames = props.fieldNames,
       _props$treeOptionName = props.treeOptionName,
       treeOptionName = _props$treeOptionName === void 0 ? {
     title: 'title',
@@ -222,7 +221,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         onChange: function onChange(value, Option) {
           return _onChange(value, resetResultOption(Option));
         }
-      }), fieldNames ? null : selectOptions.map(function (val, index) {
+      }), (defaultProps === null || defaultProps === void 0 ? void 0 : defaultProps.fieldNames) ? null : (selectOptions || []).map(function (val, index) {
         return /*#__PURE__*/_react.default.createElement(Option, {
           value: val.value,
           key: val.value || index,
@@ -402,7 +401,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       }) : /*#__PURE__*/_react.default.createElement(_cascader.default, Object.assign({
         options: selectOptions,
         allowClear: true,
-        fieldNames: fieldNames || selectOptionName,
+        fieldNames: (defaultProps === null || defaultProps === void 0 ? void 0 : defaultProps.fieldNames) || selectOptionName,
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请选择'
       }, defaultProps));
       break;

package/lib/FormComp/Uploader/index.js

@@ -243,7 +243,8 @@ var Uploader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
             url: ''
           });
         },
-        size: modalSize
+        size: modalSize,
+        zIndex: 2000
       }, modalConfig), /*#__PURE__*/_react.default.createElement("div", {
         style: {
           textAlign: 'center'

package/lib/StandardFilter/index.d.ts

@@ -26,6 +26,7 @@ declare class StandardFilter extends React.Component<StandardFilterProps, any> {
     componentDidMount(): void;
     componentDidUpdate(prevProps: StandardFilterProps): void;
     updateFormFields: (newVal?: any, force?: boolean) => void;
+    forceUpdateForm: () => void;
     handleSearch: (values: object) => void;
     handleReset: () => void;
     itemIsHide: (isHide: any) => any;

package/lib/StandardFilter/index.js

@@ -17,31 +17,15 @@ var _form = _interopRequireDefault(require("antd/es/form"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _FieldComponent = _interopRequireDefault(require("../FormComp/FieldComponent"));
-
 var _ValueFormat = _interopRequireDefault(require("../utils/ValueFormat.js"));
 
 var _index = _interopRequireDefault(require("../ButtonGroup/index"));
 
-var _index2 = require("../data/index");
-
 require("./style/index.less");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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; }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); }
+var _RenderItemGroup = _interopRequireDefault(require("../FormComp/RenderItemGroup"));
 
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -94,6 +78,12 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
       _this.filterFormRef.current.setFieldsValue(Object.assign(Object.assign({}, resetValues), newVal)); // 直接清空表单的赋值
 
 
+      if (getFormFields) getFormFields(_this.filterFormRef.current.getFieldsValue(), _this.filterFormRef);
+    }; // 强制更新表单值，用于赋初始化实例值
+
+
+    _this.forceUpdateForm = function () {
+      var getFormFields = _this.props.getFormFields;
       if (getFormFields) getFormFields(_this.filterFormRef.current.getFieldsValue(), _this.filterFormRef);
     };
 
@@ -147,40 +137,47 @@ var StandardFilter = /*#__PURE__*/function (_React$Component) {
       var reFormItemGroup = _this.state.reFormItemGroup;
 
       if (Array.isArray(reFormItemGroup)) {
-        return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, reFormItemGroup.map(function (item, index) {
-          var componentStyle = item.componentStyle,
-              isHide = item.isHide;
-          if (_this.itemIsHide(isHide)) return null;
-          return /*#__PURE__*/_react.default.createElement(FormItem, Object.assign({
-            key: item.filedName,
-            label: item.label,
-            name: item.type !== 'custom' && item.filedName,
-            rules: item.rules || (item.fieldOptions ? item.fieldOptions.rules : [])
-          }, item.protoFormItem), item.type === 'custom' && item.customRender ? item.customRender(_this.filterFormRef, Object.assign({}, item)) : /*#__PURE__*/_react.default.createElement(_FieldComponent.default, Object.assign({}, item, {
-            onChange: function onChange(val) {
-              var updateValue = val;
-
-              if (item.type === 'input' || item.type === 'textarea' || item.type === 'radio') {
-                updateValue = val.target.value;
-              }
-
-              if (Array.isArray(val)) {
-                updateValue = _toConsumableArray(val);
-              }
-
-              _this.updateFormFields(_defineProperty({}, item.filedName, updateValue));
-
-              for (var _len = arguments.length, otherParams = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-                otherParams[_key - 1] = arguments[_key];
-              }
-
-              if (item.onChange) item.onChange.apply(item, [val, _this.filterFormRef].concat(otherParams));
-            },
-            style: Object.assign({
-              width: item.type === 'checkbox' || item.type === 'radio' ? 'auto' : _index2.general.formItemStyle.xsm.width
-            }, componentStyle)
-          })));
-        }));
+        return /*#__PURE__*/_react.default.createElement(_RenderItemGroup.default, {
+          itemGroup: reFormItemGroup,
+          layout: "inline",
+          form: _this.filterFormRef,
+          // fieldSize={fieldSize}
+          // displayLayout={displayLayout}
+          doUpdateFormFields: function doUpdateFormFields() {
+            return _this.forceUpdateForm();
+          }
+        });
+        /* return <>
+           {
+             reFormItemGroup.map((item, index) => {
+               const { componentStyle, isHide } = item
+               if (this.itemIsHide(isHide)) return null
+               return (
+                 <FormItem key={item.filedName} label={item.label}
+                           name={item.type !== 'custom' && item.filedName}
+                           rules={item.rules || (item.fieldOptions ? item.fieldOptions.rules : [])}
+                           {...item.protoFormItem}>
+                   {
+                     (item.type === 'custom' && item.customRender) ? item.customRender(this.filterFormRef, { ...item }) :
+                       <FieldComponent {...item}
+                                       onChange={(val, ...otherParams) => {
+                                         let updateValue = val
+                                         if (item.type === 'input' || item.type === 'textarea' || item.type === 'radio') {
+                                           updateValue = val.target.value
+                                         }
+                                         if (Array.isArray(val)) {
+                                           updateValue = [...val]
+                                         }
+                                         this.updateFormFields({ [item.filedName]: updateValue })
+                                         if (item.onChange) item.onChange(val, this.filterFormRef, ...otherParams)
+                                       }}
+                                       style={{ width: item.type === 'checkbox' || item.type === 'radio' ? 'auto' : general.formItemStyle.xsm.width, ...componentStyle }}/>
+                   }
+                 </FormItem>
+               )
+             })
+           }
+         </>*/
       }
 
       return reFormItemGroup;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "description": "FZ standard-comp,basic of antd4.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",