fan-standard-comp 3.2.0 → 3.2.2

package/lib/FormComp/FieldComponent/RefactorTreeSelect.js

@@ -5,29 +5,35 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+require("antd/es/popover/style");
+var _popover = _interopRequireDefault(require("antd/es/popover"));
+require("antd/es/tag/style");
+var _tag = _interopRequireDefault(require("antd/es/tag"));
 require("antd/es/tree-select/style");
 var _treeSelect = _interopRequireDefault(require("antd/es/tree-select"));
 var _react = _interopRequireWildcard(require("react"));
 require("./style/index.less");
 var _utils = require("../../utils");
 var _icons = require("@ant-design/icons");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+var _excluded = ["treeData", "value", "showFullLevel", "separator", "disabled", "disabledFields", "fieldStatus", "treeOptionName", "placeholder", "protoTreeNode", "onSelect", "labelInValue"];
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _objectDestructuringEmpty(t) { if (null == t) throw new TypeError("Cannot destructure " + t); }
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0) { ; } } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 var TreeNode = _treeSelect.default.TreeNode;
 var RefactorTreeSelect = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var _props$treeData = props.treeData,
@@ -50,19 +56,38 @@ var RefactorTreeSelect = /*#__PURE__*/_react.default.forwardRef(function (props,
     protoTreeNode = props.protoTreeNode,
     _onSelect = props.onSelect,
     labelInValue = props.labelInValue,
-    otherProps = _objectWithoutProperties(props, ["treeData", "value", "showFullLevel", "separator", "disabled", "disabledFields", "fieldStatus", "treeOptionName", "placeholder", "protoTreeNode", "onSelect", "labelInValue"]);
+    otherProps = _objectWithoutProperties(props, _excluded);
   var _useState = (0, _react.useState)(null),
     _useState2 = _slicedToArray(_useState, 2),
     fullLevelName = _useState2[0],
     setFullLevelName = _useState2[1];
-  var renderTreeNode = function renderTreeNode(data, dataOptionName) {
+  /*
+  // 下拉浮层显示"全选"功能（未完善）
+   const [indeterminate, setIndeterminate] = useState(false)
+   const [checkAll, setCheckAll] = useState(false)
+   const onCheckAllChange = (e) => {
+     // setCheckedList(e.target.checked ? plainOptions : []);
+     setIndeterminate(false);
+     setCheckAll(e.target.checked);
+     // 全选
+     if (e.target.checked) {
+       console.log(convertToArray(treeData))
+       // 还需要按showCheckedStrategy判断选择的节点数量
+       otherProps?.onChange(convertToArray(treeData).map(item=> item[treeOptionName.value]))
+     } else {
+       otherProps?.onChange([])
+     }
+   }*/
+
+  var _renderTreeNode = function renderTreeNode(data, dataOptionName) {
     var nodeProps = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
     return data.map(function (dataItem) {
       var prevDataItem = _objectSpread({}, dataItem);
-      var item = _extends({}, prevDataItem); // 筛选与禁用字段内值相同的节点进行禁用
+      var item = _extends({}, (_objectDestructuringEmpty(prevDataItem), prevDataItem));
+      // 筛选与禁用字段内值相同的节点进行禁用
       var resetByDisabledFields = function resetByDisabledFields(initItem) {
         var oldItem = _objectSpread({}, initItem);
-        var nodeItem = _extends({}, oldItem);
+        var nodeItem = _extends({}, (_objectDestructuringEmpty(oldItem), oldItem));
         Object.keys(nodeItem).forEach(function (itemKeyName) {
           var isMatch = disabledFields.find(function (fItem) {
             return fItem.key === itemKeyName;
@@ -91,7 +116,7 @@ var RefactorTreeSelect = /*#__PURE__*/_react.default.forwardRef(function (props,
           checkable: item[(dataOptionName === null || dataOptionName === void 0 ? void 0 : dataOptionName.checkable) || 'checkable'],
           disableCheckbox: item[(dataOptionName === null || dataOptionName === void 0 ? void 0 : dataOptionName.disableCheckbox) || 'disableCheckbox'],
           disabled: item[(dataOptionName === null || dataOptionName === void 0 ? void 0 : dataOptionName.disabled) || 'disabled']
-        }, nodeProps), renderTreeNode(item[dataOptionName.children], dataOptionName));
+        }, nodeProps), _renderTreeNode(item[dataOptionName.children], dataOptionName));
       }
       return /*#__PURE__*/_react.default.createElement(TreeNode, _extends({
         title: item[dataOptionName.title],
@@ -134,6 +159,26 @@ var RefactorTreeSelect = /*#__PURE__*/_react.default.forwardRef(function (props,
     return selectNodeInfo.matchNode.length > 0 ? selectNodeInfo.matchNode[0][treeOptionName.title] : null;
   };
   var renderTreeSelectNode = function renderTreeSelectNode() {
+    // 限制显示多个tag
+    if (otherProps.treeCheckable && otherProps.maxTagCount) {
+      // 未自行配置`maxTagPlaceholder`时，使用当前结构，点击"+xxx"后，浮层将显示对应的标签
+      if (!otherProps.hasOwnProperty('maxTagPlaceholder')) {
+        otherProps.maxTagPlaceholder = function (omittedValues) {
+          return /*#__PURE__*/_react.default.createElement(_popover.default, {
+            zIndex: 10000,
+            content: /*#__PURE__*/_react.default.createElement("div", {
+              style: {
+                maxWidth: '350px'
+              }
+            }, omittedValues.map(function (item) {
+              return /*#__PURE__*/_react.default.createElement(_tag.default, {
+                key: item.value
+              }, item.label);
+            }))
+          }, "+", omittedValues.length);
+        };
+      }
+    }
     return /*#__PURE__*/_react.default.createElement(_treeSelect.default, _extends({
       placeholder: placeholder,
       value: value,
@@ -151,7 +196,16 @@ var RefactorTreeSelect = /*#__PURE__*/_react.default.forwardRef(function (props,
         setFullLevelName(renderParenName(newNodeInfo));
         if (_onSelect) _onSelect(value, _objectSpread(_objectSpread({}, node), newNodeInfo.matchNode[0]), extra, newNodeInfo.nodeParent);
       }
-    }), renderTreeNode(treeData, treeOptionName, protoTreeNode || {}));
+      // 下拉浮层中显示"全选"按钮
+      // dropdownRender={(originNode) => {
+      //   return otherProps?.dropdownRender ? otherProps?.dropdownRender(originNode, <div>
+      //     <div>
+      //       <Checkbox indeterminate={indeterminate} onChange={onCheckAllChange} checked={checkAll}>
+      //       全选
+      //     </Checkbox> <span>已选{value?.length}</span></div>
+      //   </div>) : originNode
+      // }}
+    }), _renderTreeNode(treeData, treeOptionName, protoTreeNode || {}));
   };
   var _useState3 = (0, _react.useState)(false),
     _useState4 = _slicedToArray(_useState3, 2),
@@ -211,7 +265,6 @@ var RefactorTreeSelect = /*#__PURE__*/_react.default.forwardRef(function (props,
     }
     return fullLevelName || '-'; // 只读显示时，只返回文本
   }
-
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, showFullLevel && !otherProps.showCheckedStrategy ? /*#__PURE__*/_react.default.createElement("div", {
     className: "refactor-tree-select ".concat(disabled ? 'refactor-disabled' : '').concat(otherProps.size === 'small' ? ' refactor-tree-select-sm' : ''),
     title: fullLevelName || ''
@@ -219,5 +272,4 @@ var RefactorTreeSelect = /*#__PURE__*/_react.default.forwardRef(function (props,
     className: "refactor-tree-select-extra"
   }, fullLevelName)) : renderTreeSelectNode());
 });
-var _default = RefactorTreeSelect;
-exports.default = _default;
+var _default = exports.default = RefactorTreeSelect;

package/lib/FormComp/FieldComponent/TitleNode.d.ts

@@ -1,6 +1,7 @@
+import React from 'react';
 interface TitleNodeProps {
     render?: any;
     data?: any;
 }
-declare const TitleNode: (props: TitleNodeProps) => JSX.Element;
+declare const TitleNode: (props: TitleNodeProps) => React.JSX.Element;
 export default TitleNode;

package/lib/FormComp/FieldComponent/TitleNode.js

@@ -5,11 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var TitleNode = function TitleNode(props) {
   var render = props.render,
     data = props.data;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, render ? render(data) : data.title || data.label);
 };
-var _default = TitleNode;
-exports.default = _default;
+var _default = exports.default = TitleNode;

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

@@ -10,7 +10,7 @@ interface OptionNameProps {
 }
 export interface FieldComponentProps {
     label?: any;
-    type?: String;
+    type?: string;
     filedName?: string;
     value?: any;
     protoConfig?: any;

package/lib/FormComp/FieldComponent/index.js

@@ -1,5 +1,6 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -30,18 +31,22 @@ require("antd/es/select/style");
 var _select = _interopRequireDefault(require("antd/es/select"));
 require("antd/es/input/style");
 var _input = _interopRequireDefault(require("antd/es/input"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _Uploader = _interopRequireDefault(require("../Uploader"));
 var _SpecIcon = _interopRequireDefault(require("../../SpecIcon"));
 var _RefactorTreeSelect = _interopRequireDefault(require("./RefactorTreeSelect.js"));
 var _setReadonlyValues = require("./setReadonlyValues.js");
 var _TitleNode = _interopRequireDefault(require("./TitleNode"));
 var _ReUpload = _interopRequireDefault(require("./ReUpload"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _ConfigContext = require("../../ConfigContext");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var TextArea = _input.default.TextArea,
   Password = _input.default.Password;
 var Option = _select.default.Option;
-var RangePicker = _datePicker.default.RangePicker; // 表单组件类型
+var RangePicker = _datePicker.default.RangePicker;
+// 表单组件类型
 var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
   var type = props.type,
     _onChange = props.onChange,
@@ -76,6 +81,8 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     selectOptionRender = props.selectOptionRender,
     render = props.render;
   var selectOptions = props.selectOptions;
+  var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
+  var providerConfig = InitFanContext[type] || {}; // 使用上下文（全局配置）设置扩展的配置项
   var compContent;
   if (selectOptionName && selectOptions) {
     // 将传值的数据进行转换
@@ -88,14 +95,14 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       });
     });
   }
-  var defaultProps = Object.assign({
+  var defaultProps = Object.assign(Object.assign({
     style: style,
     onChange: _onChange,
     value: value,
     render: render,
     size: size,
     ref: ref
-  }, protoConfig);
+  }, providerConfig), protoConfig);
   if (fieldStatus === 'disabled') {
     defaultProps.disabled = true;
   }
@@ -111,35 +118,41 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   var viewOnly = fieldStatus === 'viewOnly'; // 是否纯展示
   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,
-        maxLength: defaultProps.maxLength || 50
-      }, defaultProps));
+        maxLength: defaultProps.maxLength || 50,
+        onKeyDown: function onKeyDown(evt) {
+          if (evt.key === 'Enter') {
+            // 表单只有一个输入框时，焦点定到输入框后按下Enter会触发提交事件
+            evt.preventDefault(); // 禁止默认行为
+          }
+        }
+      }, defaultProps)));
       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
-      }, defaultProps));
+      }, defaultProps)));
       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
-      }, defaultProps));
+      }, defaultProps)));
       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({
           width: '120px'
         }, defaultProps.style)
-      }));
+      })));
       break;
     case 'select':
       // 重置返回完整字段值
@@ -160,7 +173,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) {
@@ -179,7 +192,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
           title: selectOptionRender ? selectOptionRender(val) : val.title || val.label,
           disabled: val.disabled
         }, selectOptionRender ? selectOptionRender(val) : val.label);
-      }));
+      })));
       break;
     case 'tree-select':
       compContent = /*#__PURE__*/_react.default.createElement(_RefactorTreeSelect.default, Object.assign({
@@ -287,13 +300,13 @@ 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), {
           width: 'auto'
         })
-      }));
+      })));
       break;
     case 'timePickerRange':
       if (fieldStatus === 'disabled' || defaultProps.disabled) defaultProps.placeholder = ''; // 禁用时，placeHolder不显示
@@ -301,13 +314,13 @@ 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), {
           width: 'auto'
         })
-      }));
+      })));
       break;
     case 'upload':
       compContent = viewOnly && (!value || value.length === 0) ? '-' : /*#__PURE__*/_react.default.createElement(_ReUpload.default, Object.assign({}, defaultProps, {
@@ -334,12 +347,12 @@ 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,
         fieldNames: (defaultProps === null || defaultProps === void 0 ? void 0 : defaultProps.fieldNames) || selectOptionName,
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请选择'
-      }, defaultProps));
+      }, defaultProps)));
       break;
     case 'switch':
       compContent = /*#__PURE__*/_react.default.createElement(_switch.default, Object.assign({}, defaultProps, {
@@ -352,9 +365,9 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       // compContent = viewOnly ? (String(value) === 'undefined' ? '-' : String(value)) : (<Switch {...defaultProps} checked={value} style={{ ...defaultProps.style, width: 'auto' }} />)
       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;
     case 'mentions':
       compContent = viewOnly ? value : /*#__PURE__*/_react.default.createElement(_mentions.default, Object.assign({
@@ -380,5 +393,4 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   }
   return compContent;
 });
-var _default = FieldComponent;
-exports.default = _default;
+var _default = exports.default = FieldComponent;

package/lib/FormComp/FieldComponent/setReadonlyValues.js

@@ -10,18 +10,18 @@ var _image = _interopRequireDefault(require("antd/es/image"));
 var _react = _interopRequireWildcard(require("react"));
 var _moment = _interopRequireDefault(require("moment"));
 var _util = require("../Uploader/util");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0) { ; } } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 // 设置纯展示模式下的级联选择显示值
 
-var setCascaderValue = function setCascaderValue(value, props) {
+var setCascaderValue = exports.setCascaderValue = function setCascaderValue(value, props) {
   var selectOptions = props.selectOptions,
     defaultProps = props.defaultProps;
   if (!value || value.length === 0 || !selectOptions) return '-'; // 无值情况 下
@@ -53,8 +53,7 @@ var setCascaderValue = function setCascaderValue(value, props) {
   }).join('/');
 };
 // 设置纯展示模式下的下拉、单选、多选表单值
-exports.setCascaderValue = setCascaderValue;
-var setSelectValue = function setSelectValue(value, props) {
+var setSelectValue = exports.setSelectValue = function setSelectValue(value, props) {
   var selectOptions = props.selectOptions,
     selectOptionRender = props.selectOptionRender,
     defaultProps = props.defaultProps,
@@ -76,7 +75,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 ? '' : ',' : ''));
@@ -105,8 +104,7 @@ var setSelectValue = function setSelectValue(value, props) {
   }
 };
 // 设置纯展示模式下的日期控件值
-exports.setSelectValue = setSelectValue;
-var setDatePickerValue = function setDatePickerValue(value, props) {
+var setDatePickerValue = exports.setDatePickerValue = function setDatePickerValue(value, props) {
   var type = props.type,
     protoConfig = props.protoConfig;
   if (!value && value !== 0) return '-'; // 无值情况 下
@@ -134,8 +132,7 @@ var setDatePickerValue = function setDatePickerValue(value, props) {
 };
 
 // 设置纯展示模式下的时间控件值
-exports.setDatePickerValue = setDatePickerValue;
-var setTimePickerValue = function setTimePickerValue(value, props) {
+var setTimePickerValue = exports.setTimePickerValue = function setTimePickerValue(value, props) {
   var type = props.type,
     protoConfig = props.protoConfig;
   if (!value && value !== 0) return '-'; // 无值情况 下
@@ -152,8 +149,7 @@ var setTimePickerValue = function setTimePickerValue(value, props) {
   }
 };
 // 设置纯展示模式下上传控件显示值
-exports.setTimePickerValue = setTimePickerValue;
-var setUploaderValue = function setUploaderValue(value, props) {
+var setUploaderValue = exports.setUploaderValue = function setUploaderValue(value, props) {
   if (!value && value !== 0) return '-'; // 无值情况 下
   if (Array.isArray(value)) {
     var _useState = (0, _react.useState)(),
@@ -217,5 +213,4 @@ var setUploaderValue = function setUploaderValue(value, props) {
       src: preview === null || preview === void 0 ? void 0 : preview.url
     }) : '暂无图片');
   }
-};
-exports.setUploaderValue = setUploaderValue;
+};

package/lib/FormComp/RenderItemGroup/index.js

@@ -16,7 +16,7 @@ var _react = _interopRequireDefault(require("react"));
 var _data = require("../../data");
 var _FieldComponent = _interopRequireDefault(require("../FieldComponent"));
 var _SpecIcon = _interopRequireDefault(require("../../SpecIcon"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 var FormItem = _form.default.Item;
 var RenderItemGroup = function RenderItemGroup(props) {
@@ -39,6 +39,9 @@ var RenderItemGroup = function RenderItemGroup(props) {
     if (modalSize === 'lg' || modalSize === 'xlg') {
       return 8;
     }
+    if (modalSize === 'xxlg') {
+      return 6;
+    }
     return 12;
   };
   var updateFormFields = function updateFormFields() {
@@ -55,6 +58,12 @@ var RenderItemGroup = function RenderItemGroup(props) {
     }
     return isHide || false;
   };
+  // layout='inline'条件下设置指定控件宽度自动
+  var setAutoWidth = function setAutoWidth(fieldType) {
+    var widgets = ['checkbox', 'radio', 'datePicker', 'dateTimePicker', 'rangePicker', 'rangeTimePicker', 'timePicker', 'timePickerRange'];
+    if (!fieldType) return false;
+    return widgets.includes(fieldType);
+  };
   // 渲染表单控件
   var renderFormField = function renderFormField(field) {
     var componentStyle = field.componentStyle,
@@ -76,7 +85,11 @@ var RenderItemGroup = function RenderItemGroup(props) {
         },
         fieldStatus: field.fieldStatus || fieldStatus,
         size: field.protoConfig && field.protoConfig.size || field.size || fieldSize,
-        style: componentStyle || Object.assign({}, _data.general.formItemStyle.wide)
+        // style={{ width: item.type === 'checkbox' || item.type === 'radio' ? 'auto' : general.formItemStyle.xsm.width, ...componentStyle }}
+        // style={componentStyle || (layout === 'inline' ? { ...general.formItemStyle.xsm } : { ...general.formItemStyle.wide } )}
+        style: Object.assign({
+          width: layout === 'inline' ? setAutoWidth(field.type) ? 'auto' : _data.general.formItemStyle.xsm.width : _data.general.formItemStyle.wide.width
+        }, componentStyle)
       }))), extra ? extra(field, form) : '');
     } else {
       return /*#__PURE__*/_react.default.createElement(_FieldComponent.default, Object.assign({}, field, {
@@ -95,7 +108,10 @@ var RenderItemGroup = function RenderItemGroup(props) {
         },
         fieldStatus: field.fieldStatus || fieldStatus,
         size: field.protoConfig && field.protoConfig.size || field.size || fieldSize,
-        style: componentStyle || Object.assign({}, _data.general.formItemStyle.wide)
+        // style={componentStyle || { ...general.formItemStyle.wide }}
+        style: Object.assign({
+          width: layout === 'inline' ? setAutoWidth(field.type) ? 'auto' : _data.general.formItemStyle.xsm.width : _data.general.formItemStyle.wide.width
+        }, componentStyle)
       }));
     }
   };
@@ -112,11 +128,11 @@ var RenderItemGroup = function RenderItemGroup(props) {
       }, /*#__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, {
           name: "info"
-        }))) : label,
+        })))) : label,
         rules: item.preExtra || item.extra ? [] : item.rules || (item.fieldOptions ? item.fieldOptions.rules : []),
         required: item.rules && item.rules.filter(function (rItem) {
           return rItem.required;
@@ -127,11 +143,11 @@ var RenderItemGroup = function RenderItemGroup(props) {
         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, {
           name: "info"
-        }))) : label,
+        })))) : label,
         rules: item.rules || (item.fieldOptions ? item.fieldOptions.rules : [])
       }, formLayout, item.protoFormItem), type === 'custom' && customRender ? customRender(form, Object.assign({}, item), fieldStatus) : renderFormField(Object.assign({}, item)));
     }
@@ -177,11 +193,11 @@ var RenderItemGroup = function RenderItemGroup(props) {
         }, function (FormInstance) {
           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({}, item.protoConfig, {
             className: "modalPanelTitle ".concat(((_a = item === null || item === void 0 ? void 0 : item.protoConfig) === null || _a === void 0 ? void 0 : _a.className) || '')
-          }), label) : label) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, null);
+          }), label) : label)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, null);
         });
       }
       // 判断是否强制重新渲染表单
@@ -210,5 +226,4 @@ var RenderItemGroup = function RenderItemGroup(props) {
   /* itemGroup = ReactNode则直接返回 */
   return itemGroup;
 };
-var _default = RenderItemGroup;
-exports.default = _default;
+var _default = exports.default = RenderItemGroup;

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import './style/index.less';
 interface UploaderProps {
     extraExt?: string;
     accept?: string;
@@ -16,6 +17,7 @@ interface UploaderProps {
     limit?: number;
     modalConfig?: any;
     modalZIndex?: number;
+    [k: string]: any;
 }
-declare const Uploader: React.ForwardRefExoticComponent<UploaderProps & React.RefAttributes<unknown>>;
+declare const Uploader: React.ForwardRefExoticComponent<Omit<UploaderProps, "ref"> & React.RefAttributes<unknown>>;
 export default Uploader;