fan-standard-comp 4.1.0 → 4.1.2

package/es/utils/response.js

@@ -0,0 +1,40 @@
+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); }
+import { message } from 'antd';
+import { commonUse } from "../data";
+
+/**
+ * @description 接口返回异常提示语
+ * @params {String或Object} type 指操作的类型：
+ *   @value {String} 值有 删除:'delete' 修改:'update'  新增:'create'
+ *   @value {Object} { success: 'xxx成功提示语'}
+ *
+ * @params {Object} res 接口返回数据
+ * @params {Function} callback 事件回调
+ * */
+var responseControl = function responseControl(type, res, callback) {
+  if (res.code == '200') {
+    if (typeof type === 'string') {
+      // @ts-ignore
+      message.success(commonUse.responseMsg[type].success);
+    } else if (_typeof(type) === 'object') {
+      message.success(type.success);
+    } else {
+      message.success('操作成功');
+    }
+  }
+  // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+  callback && callback(res);
+};
+/**
+ * @description 接口返回正常回调判断
+ * @params {Object} res 接口返回数据
+ * @params {Function} callback 事件回调
+ * */
+var responseQuery = function responseQuery(res, callback) {
+  if (res.code == '200') {
+    // 调用回调
+    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+    callback && callback(res);
+  }
+};
+export { responseControl, responseQuery };

package/es/utils/urlUtils.d.ts

@@ -1,14 +1,18 @@
 /**
- *  获取url的search，并有条件：`^{变量名}`的条件取本地存储的数据 // 参数格式：^{变量名} 变量名支持数字、字母、下划线
- * */
-export declare const getUrlSearch: (href: any) => {};
-/**
+ *  跳转外链、iframe 地址支持带参
  *  获取url的search，并有条件：`^{变量名}`的条件取本地存储的数据 // 参数格式：^{变量名} 变量名支持数字、字母、下划线
  *  根据url上的参数变量，重新调整跳转链接
+ *  @param {string} href 地址
+ *
+ *  @result {string} 完整的url地址
  * */
-export declare const getJumpUrlBySearch: (href: any) => any;
+export declare const getJumpUrlBySearch: (href: string) => string | undefined;
 /**
  *  是否是完整的URL
  *
  * */
-export declare const isUrl: (path: any) => boolean;
+export declare const isHttpUrl: (path: string) => boolean;
+/**
+ *  是否是完整的URL
+ * */
+export declare const isUrl: (path: string) => boolean;

package/es/utils/urlUtils.js

@@ -1,41 +1,19 @@
-// @ts-nocheck
+// @ts-nocheck 文件忽略(添加到该文件的首行)
 import { parse } from "qs";
-/**
- *  获取url的search，并有条件：`^{变量名}`的条件取本地存储的数据 // 参数格式：^{变量名} 变量名支持数字、字母、下划线
- * */
-export var getUrlSearch = function getUrlSearch(href) {
-  var searchKeys = {};
-  if (isUrl(href)) {
-    var url = new URL(href);
-    searchKeys = parse(url.search, {
-      ignoreQueryPrefix: true // 去除第一个字符'?'
-    });
-  } else {
-    searchKeys = parse(href.split('?')[1], {
-      ignoreQueryPrefix: true // 去除第一个字符'?'
-    });
-  }
-  // 有带参数，取本地的数据
-  Object.keys(searchKeys).forEach(function (item) {
-    var _searchKeys$item;
-    // 取变量名对应本地的值
-    if (((_searchKeys$item = searchKeys[item]) === null || _searchKeys$item === void 0 ? void 0 : _searchKeys$item.indexOf('^{')) !== -1) {
-      // 清除"^{"与"}"取当前的
-      var keyParam = searchKeys[item].replace('^{', '').substring(0, searchKeys[item].replace('^{', '').lastIndexOf('}'));
-      searchKeys[item] = localStorage.getItem(keyParam) || undefined;
-    }
-  });
-  return searchKeys;
-};
 
 /**
+ *  跳转外链、iframe 地址支持带参
  *  获取url的search，并有条件：`^{变量名}`的条件取本地存储的数据 // 参数格式：^{变量名} 变量名支持数字、字母、下划线
  *  根据url上的参数变量，重新调整跳转链接
+ *  @param {string} href 地址
+ *
+ *  @result {string} 完整的url地址
  * */
 export var getJumpUrlBySearch = function getJumpUrlBySearch(href) {
   var searchKeys = {};
   var getPath;
-  if (isUrl(href)) {
+  if (!href) return;
+  if (isHttpUrl(href)) {
     var url = new URL(href);
     searchKeys = parse(url.search, {
       ignoreQueryPrefix: true // 去除第一个字符'?'
@@ -49,9 +27,9 @@ export var getJumpUrlBySearch = function getJumpUrlBySearch(href) {
   }
   // 有带参数，取本地的数据，然后拼接给地址
   Object.keys(searchKeys).forEach(function (item, index) {
-    var _searchKeys$item2;
+    var _searchKeys$item;
     // 取变量名
-    if (((_searchKeys$item2 = searchKeys[item]) === null || _searchKeys$item2 === void 0 ? void 0 : _searchKeys$item2.indexOf('^{')) !== -1) {
+    if (((_searchKeys$item = searchKeys[item]) === null || _searchKeys$item === void 0 ? void 0 : _searchKeys$item.indexOf('^{')) !== -1) {
       // 清除"^{"与"}"取当前的
       var keyParam = searchKeys[item].replace('^{', '').substring(0, searchKeys[item].replace('^{', '').lastIndexOf('}'));
       searchKeys[item] = localStorage.getItem(keyParam) || '';
@@ -60,11 +38,12 @@ export var getJumpUrlBySearch = function getJumpUrlBySearch(href) {
   });
   return getPath;
 };
+
 /**
  *  是否是完整的URL
  *
  * */
-export var isUrl = function isUrl(path) {
+export var isHttpUrl = function isHttpUrl(path) {
   if (!path.startsWith('http')) {
     return false;
   }
@@ -74,4 +53,14 @@ export var isUrl = function isUrl(path) {
   } catch (error) {
     return false;
   }
+};
+
+/* eslint no-useless-escape:0 import/prefer-default-export:0 */
+var reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)$/;
+
+/**
+ *  是否是完整的URL
+ * */
+export var isUrl = function isUrl(path) {
+  return reg.test(path);
 };

package/lib/ButtonGroup/index.d.ts

@@ -39,6 +39,7 @@ interface ButtonGroupProps {
     showTextIcon?: boolean;
     className?: string;
     style?: object;
+    [k: string]: any;
 }
 declare const ButtonGroup: (props: ButtonGroupProps) => any;
 export default ButtonGroup;

package/lib/ButtonGroup/styles/index.js

@@ -53,8 +53,10 @@ var SpecButtonGroupStyleFunc = function SpecButtonGroupStyleFunc(prefix) {
     });
     var prefixCls = ".".concat(prefix);
     return [_defineProperty({}, prefixCls, _objectSpread({
-      display: 'inline-block',
+      // display: 'inline-block',
+      display: 'inline-flex',
       verticalAlign: 'middle',
+      flexWrap: 'wrap',
       alignItems: 'center',
       '> *': {
         marginLeft: token.marginSM,

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

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const ExtensionField: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<unknown>>;
+export default ExtensionField;

package/lib/FormComp/FieldComponent/ExtensionField.js

@@ -0,0 +1,27 @@
+"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
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _ConfigContext = require("../../ConfigContext");
+var _excluded = ["type", "extendType"];
+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 && Object.prototype.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 _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; }
+var ExtensionField = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
+  var providerConfig = InitFanContext['Field'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var type = props.type,
+    extendType = props.extendType,
+    fieldProps = _objectWithoutProperties(props, _excluded);
+  var MatchType = ((providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.extendComponents) || []).find(function (tItem) {
+    return tItem.extendType === extendType;
+  });
+  var MatchTypeComponent = (MatchType === null || MatchType === void 0 ? void 0 : MatchType.component) || null;
+  return typeof MatchTypeComponent === 'function' ? /*#__PURE__*/_react.default.createElement(MatchTypeComponent, fieldProps) : MatchTypeComponent;
+});
+var _default = exports.default = ExtensionField;

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

@@ -8,10 +8,16 @@ interface OptionNameProps {
     children?: string;
     [k: string]: any;
 }
+export interface FieldExtendsTypeType {
+    type: string;
+    component: (cProps: any) => React.ReactNode | React.ReactNode | any;
+    [k: string]: any;
+}
 export interface FieldComponentProps {
     label?: any;
     type?: string;
     filedName?: string;
+    fieldName?: string;
     value?: any;
     protoConfig?: any;
     onChange?: (value?: any, option?: any) => void | any;
@@ -33,6 +39,9 @@ export interface FieldComponentProps {
         value: string;
     }[];
     rules?: any;
+    defaultStyle?: React.CSSProperties;
+    extendComponents?: FieldExtendsTypeType[];
+    [k: string]: any;
 }
-declare const FieldComponent: React.ForwardRefExoticComponent<FieldComponentProps & React.RefAttributes<unknown>>;
+declare const FieldComponent: React.ForwardRefExoticComponent<Omit<FieldComponentProps, "ref"> & React.RefAttributes<unknown>>;
 export default FieldComponent;

package/lib/FormComp/FieldComponent/index.js

@@ -12,6 +12,7 @@ var _RefactorTreeSelect = _interopRequireDefault(require("./RefactorTreeSelect")
 var _setReadonlyValues = require("./setReadonlyValues");
 var _TitleNode = _interopRequireDefault(require("./TitleNode"));
 var _ReUpload = _interopRequireDefault(require("./ReUpload"));
+var _ExtensionField = _interopRequireDefault(require("./ExtensionField"));
 var _ConfigContext = require("../../ConfigContext");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
@@ -30,42 +31,50 @@ var TextArea = _antd.Input.TextArea,
 var Option = _antd.Select.Option;
 var RangePicker = _antd.DatePicker.RangePicker;
 // 表单组件类型
+// @ts-ignore
 var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
-  var type = props.type,
-    _onChange = props.onChange,
-    value = props.value,
-    style = props.style,
-    placeholder = props.placeholder,
-    protoConfig = props.protoConfig,
-    _props$treeData = props.treeData,
-    treeData = _props$treeData === void 0 ? [] : _props$treeData,
-    filedName = props.filedName,
-    _props$selectOptionNa = props.selectOptionName,
-    selectOptionName = _props$selectOptionNa === void 0 ? {
+  var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
+  var providerConfig = InitFanContext['Field'] || {}; // 使用上下文（全局配置）设置扩展的配置项
+  var _providerConfig$props = _objectSpread(_objectSpread({}, providerConfig), props),
+    type = _providerConfig$props.type,
+    _onChange = _providerConfig$props.onChange,
+    value = _providerConfig$props.value,
+    style = _providerConfig$props.style,
+    placeholder = _providerConfig$props.placeholder,
+    protoConfig = _providerConfig$props.protoConfig,
+    _providerConfig$props2 = _providerConfig$props.treeData,
+    treeData = _providerConfig$props2 === void 0 ? [] : _providerConfig$props2,
+    filedName = _providerConfig$props.filedName,
+    fieldName = _providerConfig$props.fieldName,
+    _providerConfig$props3 = _providerConfig$props.selectOptionName,
+    selectOptionName = _providerConfig$props3 === void 0 ? {
       value: 'value',
       label: 'label',
       disabled: 'disabled',
       title: 'title'
-    } : _props$selectOptionNa,
-    _props$treeOptionName = props.treeOptionName,
-    treeOptionName = _props$treeOptionName === void 0 ? {
+    } : _providerConfig$props3,
+    _providerConfig$props4 = _providerConfig$props.treeOptionName,
+    treeOptionName = _providerConfig$props4 === void 0 ? {
       title: 'title',
       value: 'value',
       children: 'children',
       disabled: 'disabled'
-    } : _props$treeOptionName,
-    _props$fieldStatus = props.fieldStatus,
-    fieldStatus = _props$fieldStatus === void 0 ? 'default' : _props$fieldStatus,
-    _props$size = props.size,
-    size = _props$size === void 0 ? 'middle' : _props$size,
-    showFullLevel = props.showFullLevel,
-    separator = props.separator,
-    disabledFields = props.disabledFields,
-    selectOptionRender = props.selectOptionRender,
-    render = props.render;
-  var selectOptions = props.selectOptions;
-  var InitFanContext = (0, _react.useContext)(_ConfigContext.FanContext);
-  var providerConfig = (InitFanContext === null || InitFanContext === void 0 ? void 0 : InitFanContext[type || '']) || {}; // 使用上下文（全局配置）设置扩展的配置项
+    } : _providerConfig$props4,
+    _providerConfig$props5 = _providerConfig$props.fieldStatus,
+    fieldStatus = _providerConfig$props5 === void 0 ? 'default' : _providerConfig$props5,
+    _providerConfig$props6 = _providerConfig$props.size,
+    size = _providerConfig$props6 === void 0 ? 'middle' : _providerConfig$props6,
+    showFullLevel = _providerConfig$props.showFullLevel,
+    separator = _providerConfig$props.separator,
+    disabledFields = _providerConfig$props.disabledFields,
+    selectOptionRender = _providerConfig$props.selectOptionRender,
+    render = _providerConfig$props.render,
+    _providerConfig$props7 = _providerConfig$props.defaultStyle,
+    defaultStyle = _providerConfig$props7 === void 0 ? {} : _providerConfig$props7,
+    extendConfig = _providerConfig$props.extendConfig;
+  var _providerConfig$props8 = _objectSpread(_objectSpread({}, providerConfig), props),
+    selectOptions = _providerConfig$props8.selectOptions;
+  var providerProtoConfig = (InitFanContext === null || InitFanContext === void 0 ? void 0 : InitFanContext[type || '']) || {}; // 使用上下文（全局配置）设置控件扩展的配置项
   var compContent;
   if (selectOptionName && selectOptions) {
     // 将传值的数据进行转换
@@ -85,12 +94,12 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     render: render,
     size: size,
     ref: ref
-  }, providerConfig), protoConfig);
+  }, providerProtoConfig), protoConfig);
   if (fieldStatus === 'disabled') {
     defaultProps.disabled = true;
   }
   var sortLimitRule = {}; // 排序字段长度限制
-  if (filedName === 'sorts' || filedName === 'sort' || filedName === 'indexSort' || filedName === 'sorta' || filedName === 'categorySort') {
+  if (filedName === 'sorts' || filedName === 'sort' || filedName === 'indexSort' || filedName === 'sorta' || filedName === 'categorySort' || fieldName === 'sorts' || fieldName === 'sort' || fieldName === 'indexSort' || fieldName === 'sorta' || fieldName === 'categorySort') {
     sortLimitRule = {
       min: 0,
       max: 999999999,
@@ -99,6 +108,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   }
   // 设置纯展示模式下的“下拉树”控件返回值
   var viewOnly = fieldStatus === 'viewOnly'; // 是否纯展示
+
   switch (type) {
     case 'input':
       compContent = viewOnly ? value || '-' : /*#__PURE__*/_react.default.createElement(_antd.Input, _extends({
@@ -112,27 +122,33 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
             evt.preventDefault(); // 禁止默认行为
           }
         }
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'password':
       compContent = viewOnly ? value ? "\u25CF\u25CF\u25CF\u25CF\u25CF\u25CF" : '-' : /*#__PURE__*/_react.default.createElement(Password, _extends({
         autoComplete: "off",
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请输入',
         maxLength: defaultProps.maxLength || 50
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'textarea':
       compContent = viewOnly ? value || '-' : /*#__PURE__*/_react.default.createElement(TextArea, _extends({
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请输入',
         maxLength: defaultProps.maxLength || 500,
         title: fieldStatus === 'disabled' || defaultProps.disabled ? value : null
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'inputNumber':
       compContent = viewOnly ? value || 0 : /*#__PURE__*/_react.default.createElement(_antd.InputNumber, _extends({
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请输入数字'
       }, sortLimitRule, defaultProps, {
-        style: _objectSpread({
+        style: _objectSpread(_objectSpread({}, defaultStyle), {}, {
           width: '120px'
         }, defaultProps.style)
       }));
@@ -171,7 +187,9 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
           return (defaultProps === null || defaultProps === void 0 || (_defaultProps$optionR = defaultProps.optionRender) === null || _defaultProps$optionR === void 0 ? void 0 : _defaultProps$optionR.call(defaultProps, _objectSpread(_objectSpread({}, option.data), option), info)) || (selectOptionRender === null || selectOptionRender === void 0 ? void 0 : selectOptionRender(_objectSpread(_objectSpread({}, option.data), option), info)) || option.label;
         }
       }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
         // onChange返回参数：累加当前选中包括其他字段值的数据
+        ,
         onChange: function onChange(value, Option) {
           return _onChange && _onChange(value, resetResultOption(Option));
         } // 数据为对象
@@ -188,7 +206,9 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         protoTreeNode: protoConfig && protoConfig.TreeNode || {},
         fieldStatus: fieldStatus,
         disabledFields: disabledFields
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'checkbox':
       delete defaultProps.ref;
@@ -198,7 +218,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         defaultProps: defaultProps,
         separator: separator
       }) : /*#__PURE__*/_react.default.createElement(_antd.Checkbox.Group, _extends({}, defaultProps, {
-        style: _objectSpread({
+        style: _objectSpread(_objectSpread({}, defaultStyle), {}, {
           width: 'auto'
         }, defaultProps.style)
       }), selectOptions && selectOptions.map(function (val, index) {
@@ -230,7 +250,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
           });
         })
       }, defaultProps, {
-        style: _objectSpread({
+        style: _objectSpread(_objectSpread({}, defaultStyle), {}, {
           width: 'auto'
         }, defaultProps.style)
       }));
@@ -244,9 +264,9 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         showTime: defaultProps.showTime || type === 'dateTimePicker',
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请选择'
       }, defaultProps, {
-        style: _objectSpread({
-          'minWidth': 'auto'
-        }, defaultProps.style)
+        style: _objectSpread(_objectSpread({
+          width: 'auto'
+        }, defaultStyle), defaultProps.style)
       }));
       break;
     case 'rangePicker':
@@ -259,9 +279,8 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         showTime: defaultProps.showTime || type === 'rangeTimePicker',
         allowEmpty: true
       }, defaultProps, {
-        style: _objectSpread({
-          width: type === 'rangeTimePicker' ? 'auto' : '100%'
-        }, defaultProps.style)
+        // style={{  width: type === 'rangeTimePicker' ? 'auto' : '100%', ...defaultStyle,...defaultProps.style }}
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
       }));
       break;
     case 'timePicker':
@@ -270,9 +289,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         type: type,
         protoConfig: protoConfig
       }) : /*#__PURE__*/_react.default.createElement(_antd.TimePicker, _extends({}, defaultProps, {
-        style: _objectSpread(_objectSpread({
-          'minWidth': 'auto'
-        }, defaultProps.style), {}, {
+        style: _objectSpread(_objectSpread(_objectSpread({}, defaultStyle), defaultProps.style), {}, {
           width: 'auto'
         })
       }));
@@ -286,11 +303,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       }) : /*#__PURE__*/_react.default.createElement(_antd.TimePicker.RangePicker, _extends({
         allowEmpty: true
       }, defaultProps, {
-        style: _objectSpread(_objectSpread({
-          'minWidth': 'auto'
-        }, defaultProps.style), {}, {
-          width: 'auto'
-        })
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
       }));
       break;
     case 'upload':
@@ -324,7 +337,9 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
         allowClear: true,
         fieldNames: (defaultProps === null || defaultProps === void 0 ? void 0 : defaultProps.fieldNames) || selectOptionName,
         placeholder: fieldStatus === 'disabled' || defaultProps.disabled ? '' : defaultProps.placeholder || placeholder || '请选择'
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'switch':
       compContent = /*#__PURE__*/_react.default.createElement(_antd.Switch, _extends({}, defaultProps, {
@@ -338,7 +353,7 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
       break;
     case 'slider':
       compContent = viewOnly ? value : /*#__PURE__*/_react.default.createElement(_antd.Slider, _extends({}, defaultProps, {
-        style: _objectSpread({}, defaultProps.style)
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
       }));
       break;
     case 'mentions':
@@ -349,20 +364,71 @@ var FieldComponent = /*#__PURE__*/_react.default.forwardRef(function (props, ref
             label: selectOptionRender ? selectOptionRender(val) : val.label
           });
         })
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), defaultProps.style)
+      }));
       break;
     case 'rate':
       compContent = /*#__PURE__*/_react.default.createElement(_antd.Rate, _extends({
         disabled: viewOnly || defaultProps.disabled
-      }, defaultProps));
+      }, defaultProps, {
+        style: _objectSpread(_objectSpread({}, defaultStyle), {}, {
+          width: 'auto'
+        }, defaultProps.style)
+      }));
       break;
     case 'custom':
       compContent = defaultProps.render && defaultProps.render(props) || defaultProps.customRender && defaultProps.customRender(props) || null;
       break;
+    // case 'extends':
+    //   compContent =  <ExtensionField {...props} {...defaultProps}/>
+    //   break;
     default:
-      compContent = value;
+      // 扩展组件
+      if (((providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.extendComponents) || []).some(function (tItem) {
+        return tItem.extendType === props.type;
+      })) {
+        compContent = /*#__PURE__*/_react.default.createElement(_ExtensionField.default, _extends({}, props, defaultProps, {
+          extendType: type
+        }));
+        // const MatchType = (extendComponents || []).find((tItem: FieldExtendsTypeType) => tItem.extendType === type)
+        // const MatchTypeComponent = MatchType?.component
+        // // const { type, ...fieldProps } = { ...props }
+        // console.log('fieldProps',  props, defaultProps)
+        // return typeof MatchTypeComponent === 'function'
+        //   ? <MatchTypeComponent ref={ref} fieldProps={props} proptoConfig={protoConfig} extendConfig={Object.assign(extendConfig || {}, MatchType?.extendConfig || {})}/>
+        //   : MatchTypeComponent
+        //
+        // const MatchType = (providerConfig?.extendComponents || []).find((tItem: FieldExtendsTypeType) => tItem.extendType === props.type)
+        // const MatchTypeComponent = MatchType?.component
+        // const { type, ...fieldProps } = props
+        // compContent = typeof MatchTypeComponent === 'function'
+        //   ? <MatchTypeComponent {...fieldProps}/>
+        //   : MatchTypeComponent
+      } else {
+        compContent = value;
+      }
       break;
   }
   return compContent;
 });
-var _default = exports.default = FieldComponent;
+var _default = exports.default = FieldComponent; //
+// // 高阶组件
+// const withLibraryInjection = (LibraryComponent) => (WrappedComponent) => {
+//   return class InjectedComponent extends React.Component {
+//     render() {
+//       return (
+//         <>
+//           <LibraryComponent {...this.props} children={<WrappedComponent {...this.props} />}/>
+//         </>
+//       );
+//     }
+//   };
+// };
+//
+//
+// // 应用HOC
+// const MyComponentWithLibrary = withLibraryInjection(FieldComponent)(ExtensionField);
+//
+//
+// export default MyComponentWithLibrary