fan-standard-comp 3.2.1 → 4.0.1

package/es/StandardForm/index.js

@@ -1,20 +1,27 @@
-import "antd/es/button/style";
-import _Button from "antd/es/button";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
+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 _excluded = ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize", "displayLayout", "itemGroupConfig"];
+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); }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(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(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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 _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; }
-import { __rest } from "tslib";
+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; }
 import React, { useEffect, useMemo } from 'react';
+import { Form, Button } from 'antd';
 import classNames from 'classnames';
-import RenderItemGroup from '../FormComp/RenderItemGroup';
-import { general } from '../data';
-import './style/index.less';
+import RenderItemGroup from "../FormComp/RenderItemGroup";
+import { general } from "../data";
+import "./style/index.less";
 import ActionList from "./ActionList";
+import useStyle from "./style/index";
 var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _props$formItemGroup = props.formItemGroup,
     formItemGroup = _props$formItemGroup === void 0 ? [] : _props$formItemGroup,
@@ -40,8 +47,15 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
     postfix = props.postfix,
     fieldSize = props.fieldSize,
     displayLayout = props.displayLayout,
-    baseProps = __rest(props, ["formItemGroup", "className", "initialValues", "layout", "grid", "getFormFields", "fieldStatus", "onSubmit", "confirmText", "onCancel", "cancelText", "actionAlign", "actionGroup", "onFinishFailed", "children", "prefix", "postfix", "fieldSize", "displayLayout"]);
-  var _Form$useForm = _Form.useForm(),
+    _props$itemGroupConfi = props.itemGroupConfig,
+    itemGroupConfig = _props$itemGroupConfi === void 0 ? {} : _props$itemGroupConfi,
+    baseProps = _objectWithoutProperties(props, _excluded);
+  var componentName = 'spec-standard-form';
+  var _useStyle = useStyle(componentName),
+    _useStyle2 = _slicedToArray(_useStyle, 2),
+    wrapSSR = _useStyle2[0],
+    hashId = _useStyle2[1];
+  var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     initForm = _Form$useForm2[0];
   useEffect(function () {
@@ -50,6 +64,7 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
       forceUpdateForm();
     }
   }, [initForm]);
+
   // 栅格尺寸
   var gridSize = useMemo(function () {
     var sizeName = 'xs';
@@ -59,12 +74,13 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (grid > 3) sizeName = 'xlg';
     return sizeName;
   }, [grid]);
+
   // 按钮组对齐位置
   var actionAlignCol = useMemo(function () {
     if (layout !== 'horizontal' || gridSize !== 'xs' || actionAlign && actionAlign !== 'default') {
       return {};
     }
-    return Object.assign(Object.assign({}, general.modalSize[gridSize].formBlockLayout.wrapperCol), {
+    return _objectSpread(_objectSpread({}, general.modalSize[gridSize].formBlockLayout.wrapperCol), {}, {
       offset: general.modalSize[gridSize].formBlockLayout.labelCol.span
     });
   }, [layout, gridSize, actionAlign]);
@@ -94,11 +110,12 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var onFormCancel = function onFormCancel() {
     if (onCancel) onCancel();
   };
+
   // 按钮组
   var renderActionGroup = function renderActionGroup() {
     var groupNode = function groupNode() {
       if (Array.isArray(actionGroup)) {
-        return actionGroup.length === 0 ? null : /*#__PURE__*/React.createElement(_Form.Item, {
+        return actionGroup.length === 0 ? null : /*#__PURE__*/React.createElement(Form.Item, {
           wrapperCol: actionAlignCol
         }, /*#__PURE__*/React.createElement(ActionList, {
           list: actionGroup,
@@ -111,25 +128,25 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
     };
     if (Array.isArray(actionGroup) && actionGroup.length === 0) return null;
     if (actionGroup) return groupNode();
-    return /*#__PURE__*/React.createElement(_Form.Item, {
+    return /*#__PURE__*/React.createElement(Form.Item, {
       className: "standardForm-actions",
       style: {
         'textAlign': !actionAlign || actionAlign === 'default' ? 'inherit' : actionAlign
       },
       wrapperCol: actionAlignCol
-    }, confirmText && /*#__PURE__*/React.createElement(_Button, {
+    }, confirmText && /*#__PURE__*/React.createElement(Button, {
       type: "primary",
       htmlType: "submit",
       size: fieldSize
-    }, confirmText), cancelText && /*#__PURE__*/React.createElement(_Button, {
+    }, confirmText), cancelText && /*#__PURE__*/React.createElement(Button, {
       onClick: function onClick() {
         return onFormCancel();
       },
       size: fieldSize
     }, cancelText));
   };
-  return /*#__PURE__*/React.createElement(_Form, Object.assign({
-    className: classNames(className, 'standardForm'),
+  return wrapSSR( /*#__PURE__*/React.createElement(Form, _extends({
+    className: classNames(componentName, 'standardForm', hashId, className),
     ref: ref,
     form: initForm,
     initialValues: initialValues,
@@ -138,14 +155,15 @@ var StandardForm = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onFinish: onFormFinish,
     onFinishFailed: onFormFinishFailed,
     scrollToFirstError: true
-  }), prefix, children, /*#__PURE__*/React.createElement(React.Fragment, null, formItemGroup.length > 0 ? /*#__PURE__*/React.createElement(RenderItemGroup, {
+  }), prefix, children, /*#__PURE__*/React.createElement(React.Fragment, null, formItemGroup.length > 0 ? /*#__PURE__*/React.createElement(RenderItemGroup, _extends({
     itemGroup: formItemGroup,
     fieldSize: fieldSize,
-    displayLayout: displayLayout,
+    displayLayout: displayLayout
     // doUpdateFormFields={() => forceUpdateForm()}
+    ,
     size: gridSize,
     layout: layout,
     fieldStatus: fieldStatus
-  }) : null, renderActionGroup()), postfix);
+  }, itemGroupConfig)) : null, renderActionGroup()), postfix));
 });
 export default StandardForm;

package/es/StandardForm/style/index.d.ts

@@ -0,0 +1,6 @@
+import { GlobalToken } from "antd";
+export interface StandardFormTokenType extends GlobalToken {
+    [k: string]: any;
+}
+declare const StandardFormStyleFunc: (prefix: string) => any;
+export default StandardFormStyleFunc;

package/es/StandardForm/style/index.js

@@ -0,0 +1,49 @@
+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); }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(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); }
+import { createStyleHook } from "../../theme/utils/genStyleHook";
+import { TinyColor } from "@ctrl/tinycolor";
+var StandardFormStyleFunc = function StandardFormStyleFunc(prefix) {
+  var prepareComponentToken = function prepareComponentToken(token) {
+    return {
+      // fontWeight: 400,
+    };
+  };
+  return createStyleHook(prefix, function (token) {
+    var prefixCls = ".".concat(prefix);
+    var rowTd = {
+      '> td': {
+        borderColor: new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString(),
+        // fade(@primary-color, 50%),
+        '&::before': {
+          borderTop: "1px solid ".concat(new TinyColor(token.colorPrimary).setAlpha(0.5).toRgbString())
+        }
+      }
+    };
+    return [_defineProperty(_defineProperty({}, prefixCls, {
+      '&.ant-form-inline': {
+        ' .ant-form-item': {
+          marginBottom: token.marginMD
+        }
+      },
+      '&.ant-form-horizontal': {
+        ' &.ant-form-small .ant-form-item-label> label': {
+          minHeight: token.controlHeightSM
+        },
+        '&.ant-form-large .ant-form-item-label> label': {
+          minHeight: token.controlHeightLG
+        },
+        '.ant-form-item-label': {
+          '> label ': {
+            minHeight: token.controlHeight
+          }
+        }
+      }
+    }), '.stepForm-content', {
+      margin: "".concat(token.marginMD, "px 0")
+    })];
+  }, prepareComponentToken // 当前组件扩展的变量
+  );
+};
+export default StandardFormStyleFunc;

package/es/StandardForm/style/index.less

@@ -1,37 +1,45 @@
-@root-entry-name: default;
-@import (reference) '~antd/es/style/themes/index';
 
 .standardForm {
   &.ant-form-inline {
     .ant-form-item {
-      margin-bottom: @padding-md;
+      //margin-bottom: @padding-md;
     }
-    .ant-form-item-explain, .ant-form-item-extra{
+
+    .ant-form-item-explain, .ant-form-item-extra {
       position: absolute;
     }
+
     .ant-slider {
       min-width: 100px;
     }
   }
+
   &.ant-form-horizontal {
     &.ant-form-small {
-      .ant-form-item-label> label {
-        min-height: @input-height-sm;}
+      .ant-form-item-label > label {
+        //min-height: @input-height-sm;
+      }
     }
+
     &.ant-form-large {
-      .ant-form-item-label> label {
-        min-height: @input-height-lg;}
+      .ant-form-item-label > label {
+        //min-height: @input-height-lg;
+      }
     }
+
     .ant-form-item-label {
       white-space: inherit;
+
       > label {
-        min-height: @input-height-base;
+        //min-height: @input-height-base;
         height: auto;
-        &.ant-form-item-required{
+
+        &.ant-form-item-required {
           padding-left: 8px;
+
           &:before {
             position: absolute;
-            left:1px;
+            left: 1px;
             margin-right: 0;
           }
         }
@@ -44,13 +52,16 @@
       margin-left: 8px;
     }
   }
+
   .stepForm-content {
-    margin: @padding-md 0;
+    //margin: @padding-md 0;
   }
+
   .tabForm-content-inline,
   .stepForm-content-inline {
     display: flex;
     flex-wrap: wrap;
+
     .ant-select {
       min-width: 100px;
     }

package/es/StandardModal/UpdateFormRef.js

@@ -11,5 +11,4 @@ var updateModalForm = function updateModalForm(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null);
   /* 如果是ReactNode则直接返回 */
 };
-
 export default updateModalForm;

package/es/StandardModal/index.d.ts

@@ -5,9 +5,9 @@ import { ItemGroupProps } from '../StandardForm/index';
 import './style/index.less';
 export interface StandardModalProps extends ModalProps {
     children?: React.ReactNode;
-    title?: String;
+    title?: String | React.ReactNode;
     type?: 'form' | 'tabForm' | 'gridForm' | String;
-    size?: any;
+    size?: string;
     formItemGroup?: ItemGroupProps[];
     formPrefix?: (modalForm?: any, props?: StandardModalProps, forceUpdateForm?: () => void) => React.ReactNode;
     formPostfix?: (modalForm?: any, props?: StandardModalProps, forceUpdateForm?: () => void) => React.ReactNode;
@@ -37,7 +37,8 @@ export interface StandardModalProps extends ModalProps {
     confirmButtonProps?: any;
     cancelButtonProps?: any;
     dragAble?: boolean;
+    itemGroupConfig?: object;
     [k: string]: any;
 }
-declare const StandardModal: (props: StandardModalProps) => JSX.Element;
+declare const StandardModal: (props: StandardModalProps) => any;
 export default StandardModal;