shineout 1.7.0 → 1.7.1-beta.3

package/css/Form/index.d.ts

@@ -0,0 +1,466 @@
+import * as React from 'react'
+import { StandardProps } from '../@types/common'
+import { ButtonProps } from '../Button'
+import { RuleParamsType } from '../Rule'
+
+type ReactNode = React.ReactNode;
+
+export interface Base {
+  [formItemName: string]: any;
+}
+
+export interface RuleParams<Value = {}> {
+  [propName: string]: RuleParamsType<Value>
+}
+
+export interface FieldSetChildrenFunc<Value = any> {
+  list: any;
+  value: Value;
+  onChange: (value: Value) => void;
+  onRemove: () => void;
+  index: number;
+  onInsert: (value: Value) => void;
+  onAppend: (value: Value) => void;
+}
+
+
+export interface FieldChildrenFunc<Value = any> {
+  value: Value;
+  error: Error;
+  onChange: (value: Value) => void;
+}
+
+export interface FormProps<Value> extends StandardProps {
+  /**
+   * Form value
+   *
+   * Form值
+   *
+   * default:
+   */
+  value?: Value,
+
+  /**
+   * Form defaultValue
+   *
+   * Form默认值，仅当没有传value的时候生效
+   *
+   * default:
+   */
+  defaultValue?: Value,
+
+  /**
+   * The formdata helper class, which is created automatically inside a Form without setting it, usually does not need to be set.
+   *
+   * formdata 辅助类，不设置Form内部会自动创建，通常情况下不需要设置。
+   *
+   * default:
+   */
+  datum?: object;
+
+  /**
+   * When disabled is true, all the elements in the form are disabled.
+   *
+   * 是否禁用，为 true 时，表单内所有元素 disabled 都为 true
+   *
+   * default: false
+   */
+  disabled?: boolean;
+
+  /**
+   * When inline is true, the form is horizontal layout
+   *
+   * 是否水平布局
+   *
+   * default: false
+   */
+  inline?: boolean;
+
+  /**
+   * The default is empty, follow the theme style.
+   *
+   * 默认为空，跟随主题样式。
+   *
+   * default:
+   */
+  labelAlign?: 'top' | 'right' | 'left';
+
+  /**
+   * the default value is top.
+   *
+   * 默认顶部对齐
+   *
+   * default: 'top'
+   */
+  labelVerticalAlign?: 'top' | 'middle' | 'bottom';
+
+  /**
+   * The width of label. It is invalid when labelAlign is 'top'.
+   *
+   * 标签宽度，labelAlign 为 'top' 时无效。
+   *
+   * default: 140px
+   */
+  labelWidth?: string | number;
+
+  /**
+   * Single-line error prompt will not stretch the page height
+   *
+   * 单行错误提示不撑开页面高度
+   *
+   * default: false
+   */
+  keepErrorHeight?: boolean;
+
+  /**
+   * mode, with useMode
+   *
+   * 模式，和 useMode 配合使用
+   *
+   * default:
+   */
+  mode?: string;
+
+  /**
+   * callback function, executed when the value is changing
+   *
+   * 表单内组件值变化函数
+   *
+   * default:
+   */
+  onChange?: (data: Value) => void;
+
+  /**
+   * callback when the error happens
+   *
+   * 异常回调处理
+   *
+   * default:
+   */
+  onError?: (err: Error) => void;
+
+  /**
+   * the function for Form Submission.  When the internal validation fails, it will not be triggered.
+   *
+   * 表单提交函数。表单内部校验失败时不会触发。
+   *
+   * default:
+   */
+  onSubmit?: (data: Value) => void;
+
+  /**
+   * When removeUndefined is true, remove undefined value on submit.
+   *
+   * 是否删除值为 undefined 的字段，默认值为删除
+   *
+   * default: true
+   */
+  removeUndefined?: boolean;
+
+  /**
+   * validation rules, see details in the Rules
+   *
+   * 校验规则，详见 Rules
+   *
+   * default:
+   */
+  rules?: Base;
+
+  /**
+   * When the verification fails, whether to scroll to the first verification failure component, when the value is a number, it means the offset relative to the top
+   *
+   * 校验失败时是否滚动到第一个校验失败组件，该值为数字时，表示相对于顶部的偏移量
+   *
+   * default: false
+   */
+  scrollToError?: boolean | number;
+
+  /**
+   * ms, the interval between two submissions(Prevent repeat submission)
+   *
+   * ms, 两次提交间隔时长（防止重复提交）
+   *
+   * default: 1000
+   */
+  throttle?: number;
+
+  /**
+   * validate after set value
+   *
+   * 设置 value 后是否自动校验
+   *
+   * default: false
+   */
+  initValidate?: boolean;
+
+  /**
+   * bind form ref, Can call some form methods
+   *
+   * 绑定 form 的引用, 可以调用某些 form 的方法
+   *
+   * default: -
+   */
+  formRef?: (form: any) => void;
+
+}
+
+export interface FormItemProps extends StandardProps {
+
+  /**
+   * When it is undefined, the tag does not be rendered or occupy space. If there is no content, but it needs to be occupied, you can use an empty string ''.
+   *
+   * 未定义时，标签不会render，也不会占位。如果无内容需要占位，使用空字符串 ''。
+   *
+   * default: undefined
+   */
+  label?: string | ReactNode;
+
+  /**
+   * The default is empty, follow the theme style.
+   *
+   * 默认为空，跟随主题样式。
+   *
+   * default:
+   */
+  labelAlign?: 'top' | 'right' | 'left';
+
+  /**
+   * The width of label. It is invalid when labelAlign is 'top'.
+   *
+   * 标签宽度，labelAlign 为 'top' 时无效。
+   *
+   * default: 140px
+   */
+  labelWidth?: string | number;
+
+  /**
+   * Required tags for pure display. Do not trigger validation
+   *
+   * 必填标记，纯展示用，不会触发校验
+   *
+   * default: false
+   */
+  required?: boolean;
+
+  /**
+   * Prompting information
+   *
+   * 提示文案
+   *
+   * default:
+   */
+  tip?: string;
+
+  /**
+   * Single-line error prompt will not stretch the page height
+   *
+   * 单行错误提示不撑开页面高度
+   *
+   * default: false
+   */
+  keepErrorHeight?: boolean;
+
+}
+
+export interface FormFieldProps<Value> {
+  /**
+   * The name of a Form that accesses data
+   *
+   * Form 存取数据的名称
+   *
+   * default: none
+   */
+  name: string;
+
+  /**
+   * bind name, render while the name change
+   *
+   * 绑定校验字段名。当值变化后，触发绑定的字段校验。
+   *
+   * default:
+   */
+  bind?: string[];
+
+  /**
+   * React components that support value and onChange or function. The function object attribute is as follows: value: The value obtained from the parent Form or Form.Block by name. error: the error information of data validation. type is Error. onChange: The callback when the value is changing.
+   *
+   * 支持 value 和 onChange 的 React 组件，或者函数，函数object属性如下。value: 根据 name 从上级 Form 或 Form.Block 获取的值。error：数据校验错误信息，类型为 Error。onChange: 值改变回调函数
+   *
+   * default: required
+   */
+  children?: ((opts: FieldChildrenFunc<Value>) => ReactNode) | ReactNode;
+
+  /**
+   * default value
+   *
+   * 默认值
+   *
+   * default:
+   */
+  defaultValue?: string | number;
+
+  /**
+   * Validation rules
+   *
+   * 校验规则
+   *
+   * default: none
+   */
+  rules?: RuleParamsType<Value>;
+
+}
+
+export interface FormFieldSetProps<Value> {
+  /**
+   * The name that accesses data from from
+   *
+   * 从 Form 中存取数据的名称
+   *
+   * default: required
+   */
+  name: string;
+
+  /**
+   * When children type is not function, handle a set data type of object
+   *
+   * When children type is function, handle a group of data type of array. options property:
+   *
+   * list: all data of name.
+   *
+   * value: a single piece of data for the value obtained by name.
+   *
+   * onChange: a callback when the value is changing.
+   *
+   * onRemove: a callback when a child component is removed.
+   *
+   * index: the current index.
+   *
+   * onInsert: Insert a piece of data before the current item.
+   *
+   * onAppend: Insert a piece of data after the current item.
+   *
+   * children 不为 function，用来处理 object 类型数据，children 内的 name 会拼接 FieldSet name，如 FieldSet name 为 'a', children 元素name 为 b，children 实际处理的数据为 a.b;
+   *
+   * children 为 function 时，用来处理数组数据。options 属性为
+   *
+   * list: name 下的全部数据。
+   *
+   * value: 根据name获取的值的单条数据。
+   *
+   * onChange: 子组件数据改变回调。
+   *
+   * onRemove: 子组件删除回调。
+   *
+   * index: 当前项索引。
+   *
+   * onInsert: 在当前项之前插入一条数据。
+   *
+   * onAppend: 在当前项之后附加一条数据。
+   *
+   * default: required
+   */
+  children?: ((opts: FieldSetChildrenFunc<Value>) => ReactNode) | ReactNode;
+
+  /**
+   * Default value
+   *
+   * 默认值
+   *
+   * default:
+   */
+  defaultValue?: string | number;
+
+  /**
+   * content with empty
+   *
+   * 数据为空时展示内容。（仅在children为function时有效）
+   *
+   * default:
+   */
+  empty?: (onInsert: Value) => ReactNode;
+
+  /**
+   * Validation rules
+   *
+   * 校验规则
+   *
+   * default: none
+   */
+  rules?: RuleParamsType<Value>;
+
+}
+
+export interface FormFlowProps {
+
+  /**
+   * datum is the object of Datum.Form.
+   *
+   * datum 为 Datum.Form 对象
+   *
+   * default: required
+   */
+  children?: (datum: any) => ReactNode;
+
+  /**
+   * Specifying which fields to change trigger the Flow update.
+   *
+   * names 为空时，Form 内任意值变化会触发 Flow 更新；不为空时，只监听指定字段变化
+   *
+   * default: none
+   */
+  names?: string[];
+
+}
+
+export interface FormSubmitProps extends ButtonProps { }
+
+export interface FormResetProps extends ButtonProps { }
+
+declare class FormFlow extends React.Component<FormFlowProps, {}> {
+  render(): JSX.Element;
+}
+
+declare class FormFieldSet<Value> extends React.Component<FormFieldSetProps<Value>, {}> {
+  render(): JSX.Element;
+}
+
+declare class FormField<Value> extends React.Component<FormFieldProps<Value>, {}> {
+  render(): JSX.Element;
+}
+
+declare class FormItem extends React.Component<FormItemProps, {}> {
+  render(): JSX.Element;
+}
+
+declare class FormButton extends React.Component<ButtonProps, {}> {
+  render(): JSX.Element;
+}
+
+declare class FormSubmit extends React.Component<FormSubmitProps, {}> {
+  render(): JSX.Element;
+}
+
+declare class FormReset extends React.Component<FormResetProps, {}> {
+  render(): JSX.Element;
+}
+
+
+declare class Form<Value> extends React.Component<FormProps<Value>, {}> {
+  static Item: typeof FormItem;
+
+  static Field: typeof FormField;
+
+  static FieldSet: typeof FormFieldSet;
+
+  static Flow: typeof FormFlow;
+
+  static Button: typeof FormButton;
+
+  static Submit: typeof FormSubmit;
+
+  static Reset: typeof FormReset;
+
+  render(): JSX.Element;
+}
+
+export default Form

package/css/Form/index.js

@@ -39,7 +39,7 @@ var exportForm = (0, _func.compose)(_Datum.default.hoc({
   type: 'form',
   bindProps: ['removeUndefined', 'error']
 }), _formContext.formProvider)((0, _context.consumer)(_Form.default, ['setFormStatus']));
-exportForm.Item = (0, _formContext.formConsumer)(['formDatum', 'labelWidth', 'labelAlign', 'labelVerticalAlign'])(_Item.default);
+exportForm.Item = (0, _formContext.formConsumer)(['formDatum', 'labelWidth', 'labelAlign', 'labelVerticalAlign', 'keepErrorHeight'])(_Item.default);
 exportForm.Field = (0, _inputable.default)(_Field.default);
 exportForm.Block = (0, _formContext.formConsumer)(['formDatum', 'combineRules'])(_Block.default);
 exportForm.BlockField = (0, _inputable.default)(_BlockField.default);

package/css/Form/inputable.js

@@ -100,12 +100,21 @@ var _default = (0, _func.curry)(function (Origin) {
       _Component.prototype.componentDidMount.call(this);
 
       var _this$props = this.props,
-          formDatum = _this$props.formDatum,
-          loopContext = _this$props.loopContext,
-          name = _this$props.name,
-          defaultValue = _this$props.defaultValue,
-          bindInputToItem = _this$props.bindInputToItem,
-          popover = _this$props.popover;
+          onChange = _this$props.onChange,
+          readOnly = _this$props.readOnly,
+          disabled = _this$props.disabled;
+
+      if ('value' in this.props && !onChange && disabled !== true && readOnly !== true) {
+        console.error('You provided a `value` prop to a form field without an `onChange` handler. This will render a read-only field. If the field should be mutable use `defaultValue`. Otherwise, set either `onChange` or `readOnly`');
+      }
+
+      var _this$props2 = this.props,
+          formDatum = _this$props2.formDatum,
+          loopContext = _this$props2.loopContext,
+          name = _this$props2.name,
+          defaultValue = _this$props2.defaultValue,
+          bindInputToItem = _this$props2.bindInputToItem,
+          popover = _this$props2.popover;
 
       if (formDatum && name) {
         if (Array.isArray(name)) {
@@ -144,11 +153,11 @@ var _default = (0, _func.curry)(function (Origin) {
     _proto.componentWillUnmount = function componentWillUnmount() {
       _Component.prototype.componentWillUnmount.call(this);
 
-      var _this$props2 = this.props,
-          formDatum = _this$props2.formDatum,
-          name = _this$props2.name,
-          loopContext = _this$props2.loopContext,
-          unbindInputFromItem = _this$props2.unbindInputFromItem;
+      var _this$props3 = this.props,
+          formDatum = _this$props3.formDatum,
+          name = _this$props3.name,
+          loopContext = _this$props3.loopContext,
+          unbindInputFromItem = _this$props3.unbindInputFromItem;
       clearTimeout(this.updateTimer);
 
       if (formDatum && name) {
@@ -165,11 +174,11 @@ var _default = (0, _func.curry)(function (Origin) {
     };
 
     _proto.getValue = function getValue() {
-      var _this$props3 = this.props,
-          formDatum = _this$props3.formDatum,
-          name = _this$props3.name,
-          value = _this$props3.value,
-          defaultValue = _this$props3.defaultValue;
+      var _this$props4 = this.props,
+          formDatum = _this$props4.formDatum,
+          name = _this$props4.name,
+          value = _this$props4.value,
+          defaultValue = _this$props4.defaultValue;
 
       if (formDatum && name) {
         if (Array.isArray(name)) {
@@ -187,10 +196,10 @@ var _default = (0, _func.curry)(function (Origin) {
     };
 
     _proto.getError = function getError() {
-      var _this$props4 = this.props,
-          formDatum = _this$props4.formDatum,
-          name = _this$props4.name,
-          error = _this$props4.error;
+      var _this$props5 = this.props,
+          formDatum = _this$props5.formDatum,
+          name = _this$props5.name,
+          error = _this$props5.error;
 
       if ('error' in this.props) {
         return error;
@@ -208,11 +217,11 @@ var _default = (0, _func.curry)(function (Origin) {
     };
 
     _proto.handleError = function handleError(error) {
-      var _this$props5 = this.props,
-          formDatum = _this$props5.formDatum,
-          name = _this$props5.name,
-          onItemError = _this$props5.onItemError,
-          onError = _this$props5.onError;
+      var _this$props6 = this.props,
+          formDatum = _this$props6.formDatum,
+          name = _this$props6.name,
+          onItemError = _this$props6.onItemError,
+          onError = _this$props6.onError;
 
       if (formDatum && name) {
         if (!(0, _errors.isSameError)(error, formDatum.getError(this.errorName, true))) {
@@ -238,11 +247,11 @@ var _default = (0, _func.curry)(function (Origin) {
     _proto.validate = function validate(value, data, type) {
       var _this3 = this;
 
-      var _this$props6 = this.props,
-          name = _this$props6.name,
-          formDatum = _this$props6.formDatum,
-          combineRules = _this$props6.combineRules,
-          bind = _this$props6.bind;
+      var _this$props7 = this.props,
+          name = _this$props7.name,
+          formDatum = _this$props7.formDatum,
+          combineRules = _this$props7.combineRules,
+          bind = _this$props7.bind;
       var names = Array.isArray(name) ? name : [name];
       var validates = [];
       var validateProps = (0, _objects.filterProps)(this.props, function (v) {
@@ -294,11 +303,11 @@ var _default = (0, _func.curry)(function (Origin) {
     _proto.handleChange = function handleChange(value) {
       var _this4 = this;
 
-      var _this$props7 = this.props,
-          formDatum = _this$props7.formDatum,
-          name = _this$props7.name,
-          fieldSetValidate = _this$props7.fieldSetValidate,
-          onChange = _this$props7.onChange;
+      var _this$props8 = this.props,
+          formDatum = _this$props8.formDatum,
+          name = _this$props8.name,
+          fieldSetValidate = _this$props8.fieldSetValidate,
+          onChange = _this$props8.onChange;
       var currentValue = this.getValue();
 
       for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -338,10 +347,10 @@ var _default = (0, _func.curry)(function (Origin) {
         return;
       }
 
-      var _this$props8 = this.props,
-          name = _this$props8.name,
-          onChange = _this$props8.onChange,
-          forceChangeOnValueSet = _this$props8.forceChangeOnValueSet;
+      var _this$props9 = this.props,
+          name = _this$props9.name,
+          onChange = _this$props9.onChange,
+          forceChangeOnValueSet = _this$props9.forceChangeOnValueSet;
       var newValue = !Array.isArray(name) ? value : (0, _immer.default)(this.getValue(), function (draft) {
         name.forEach(function (n, i) {
           if (n === sn) draft[i] = value;
@@ -372,18 +381,18 @@ var _default = (0, _func.curry)(function (Origin) {
     };
 
     _proto.render = function render() {
-      var _this$props9 = this.props,
-          formDatum = _this$props9.formDatum,
-          value = _this$props9.value,
-          required = _this$props9.required,
-          loopContext = _this$props9.loopContext,
-          bind = _this$props9.bind,
-          onItemError = _this$props9.onItemError,
-          bindInputToItem = _this$props9.bindInputToItem,
-          unbindInputFromItem = _this$props9.unbindInputFromItem,
-          scuSkip = _this$props9.scuSkip,
-          defaultValue = _this$props9.defaultValue,
-          other = (0, _objectWithoutPropertiesLoose2.default)(_this$props9, ["formDatum", "value", "required", "loopContext", "bind", "onItemError", "bindInputToItem", "unbindInputFromItem", "scuSkip", "defaultValue"]);
+      var _this$props10 = this.props,
+          formDatum = _this$props10.formDatum,
+          value = _this$props10.value,
+          required = _this$props10.required,
+          loopContext = _this$props10.loopContext,
+          bind = _this$props10.bind,
+          onItemError = _this$props10.onItemError,
+          bindInputToItem = _this$props10.bindInputToItem,
+          unbindInputFromItem = _this$props10.unbindInputFromItem,
+          scuSkip = _this$props10.scuSkip,
+          defaultValue = _this$props10.defaultValue,
+          other = (0, _objectWithoutPropertiesLoose2.default)(_this$props10, ["formDatum", "value", "required", "loopContext", "bind", "onItemError", "bindInputToItem", "unbindInputFromItem", "scuSkip", "defaultValue"]);
       return _react.default.createElement(Origin, (0, _extends2.default)({}, other, {
         formDatum: formDatum,
         error: this.getError(),
@@ -424,7 +433,9 @@ var _default = (0, _func.curry)(function (Origin) {
     unbindInputFromItem: _propTypes.default.func,
     value: _propTypes.default.any,
     scuSkip: _propTypes.default.array,
-    error: _propTypes.default.object
+    error: _propTypes.default.object,
+    readOnly: _propTypes.default.bool,
+    disabled: _propTypes.default.oneOfType([_propTypes.default.bool, _propTypes.default.func])
   }), (0, _defineProperty2.default)(_class, "defaultProps", {
     rules: [],
     scuSkip: ['onChange', 'rules']

package/css/Form/styles/form.css

@@ -10,6 +10,18 @@
           align-items: flex-start;
   margin-bottom: var(--form-item-margin-bottom, 20px);
 }
+.so-form-item.so-form-item-keep-height {
+  margin-bottom: var(--form-Item-min-keep-height, 24px);
+}
+.so-form-item.so-form-item-keep-height .so-form-error {
+  margin: 0;
+  height: auto;
+  min-height: var(--form-Item-min-keep-height, 24px);
+  line-height: 1.5715;
+}
+.so-form-item.so-form-item-keep-height.so-form-invalid {
+  margin-bottom: 0;
+}
 .so-form-item.so-form-label-vertical-align-middle {
   -webkit-box-align: center;
       -ms-flex-align: center;

package/css/Gap/index.d.ts

@@ -0,0 +1,28 @@
+import * as React from 'react'
+import { StandardProps } from '../@types/common'
+
+export interface GapProps extends StandardProps{
+
+  /**
+   * column spacing in the horizontal direction
+   * 
+   * 水平方向的列间距
+   * 
+   * default: 8
+   */
+  column?: number | string;
+
+  /**
+   * vertical line spacing
+   * 
+   * 垂直方向的行间距
+   * 
+   * default: 8
+   */
+  row?: number | string;
+
+}
+
+declare class Gap extends React.Component<GapProps, any> {}
+
+export default Gap