合并单元格透传

src/renderers/Form/Table.tsx

@@ -1,14 +1,14 @@
-import React from 'react';
-import {FormItem, FormControlProps} from './Item';
-import cx from 'classnames';
-import Button from '../../components/Button';
-import {createObject, isObjectShallowModified} from '../../utils/helper';
-import {RendererData, Action, Api, Payload} from '../../types';
-import {isEffectiveApi} from '../../utils/api';
-import {filter} from '../../utils/tpl';
-import omit = require('lodash/omit');
-import {dataMapping} from '../../utils/tpl-builtin';
-import findIndex = require('lodash/findIndex');
+import React from "react";
+import { FormItem, FormControlProps } from "./Item";
+import cx from "classnames";
+import Button from "../../components/Button";
+import { createObject, isObjectShallowModified } from "../../utils/helper";
+import { RendererData, Action, Api, Payload } from "../../types";
+import { isEffectiveApi } from "../../utils/api";
+import { filter } from "../../utils/tpl";
+import omit = require("lodash/omit");
+import { dataMapping } from "../../utils/tpl-builtin";
+import findIndex = require("lodash/findIndex");
 
 export interface TableProps extends FormControlProps {
   placeholder?: string;
@@ -44,29 +44,29 @@ export interface TableState {
 
 export default class FormTable extends React.Component<TableProps, TableState> {
   static defaultProps = {
-    placeholder: '空',
+    placeholder: "空",
     scaffold: {},
-    addBtnIcon: 'fa fa-plus',
-    updateBtnIcon: 'fa fa-pencil',
-    deleteBtnIcon: 'fa fa-minus',
-    confirmBtnIcon: 'fa fa-check',
-    cancelBtnIcon: 'fa fa-times',
-    valueField: ''
+    addBtnIcon: "fa fa-plus",
+    updateBtnIcon: "fa fa-pencil",
+    deleteBtnIcon: "fa fa-minus",
+    confirmBtnIcon: "fa fa-check",
+    cancelBtnIcon: "fa fa-times",
+    valueField: ""
   };
 
   static propsList: Array<string> = [
-    'onChange',
-    'name',
-    'columns',
-    'label',
-    'scaffold',
-    'showAddBtn',
-    'addable',
-    'removable',
-    'editable',
-    'addApi',
-    'updateApi',
-    'deleteApi'
+    "onChange",
+    "name",
+    "columns",
+    "label",
+    "scaffold",
+    "showAddBtn",
+    "addable",
+    "removable",
+    "editable",
+    "addApi",
+    "updateApi",
+    "deleteApi"
   ];
 
   entries: Map<any, number>;
@@ -115,7 +115,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
         return Promise.all(subForms.map(item => item.validate())).then(
           values => {
             if (~values.indexOf(false)) {
-              return '内部表单验证失败';
+              return "内部表单验证失败";
             }
 
             return;
@@ -128,7 +128,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
   doAction(action: Action, ctx: RendererData, ...rest: Array<any>) {
     const { onAction, value, valueField, env, onChange, editable } = this.props;
 
-    if (action.actionType === 'add') {
+    if (action.actionType === "add") {
       const rows = Array.isArray(value) ? value.concat() : [];
 
       if (action.payload) {
@@ -159,13 +159,13 @@ export default class FormTable extends React.Component<TableProps, TableState> {
         return this.addItem(rows.length - 1);
       }
     } else if (
-      action.actionType === 'remove' ||
-      action.actionType === 'delete'
+      action.actionType === "remove" ||
+      action.actionType === "delete"
     ) {
       if (!valueField) {
-        return env.alert('请配置 valueField');
+        return env.alert("请配置 valueField");
       } else if (!action.payload) {
-        return env.alert('action 上请配置 payload, 否则不清楚要删除哪个');
+        return env.alert("action 上请配置 payload, 否则不清楚要删除哪个");
       }
 
       const rows = Array.isArray(value) ? value.concat() : [];
@@ -249,7 +249,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
     }
 
     if (remote && !remote.ok) {
-      env.notify('error', remote.msg || '保存失败');
+      env.notify("error", remote.msg || "保存失败");
       return;
     } else if (remote && remote.ok) {
       item = {
@@ -300,7 +300,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
     const ctx = createObject(data, item);
     if (isEffectiveApi(deleteApi, ctx)) {
       const confirmed = await env.confirm(
-        deleteConfirmText ? filter(deleteConfirmText, ctx) : '确认要删除？'
+        deleteConfirmText ? filter(deleteConfirmText, ctx) : "确认要删除？"
       );
       if (!confirmed) {
         // 如果不确认，则跳过！
@@ -310,7 +310,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
       const result = await env.fetcher(deleteApi, ctx);
 
       if (!result.ok) {
-        env.notify('error', '删除失败');
+        env.notify("error", "删除失败");
         return;
       }
     }
@@ -363,19 +363,19 @@ export default class FormTable extends React.Component<TableProps, TableState> {
     if (props.editable) {
       columns = columns.map(column => {
         const quickEdit =
-          !isCreateMode && column.hasOwnProperty('quickEditOnUpdate')
+          !isCreateMode && column.hasOwnProperty("quickEditOnUpdate")
             ? column.quickEditOnUpdate
             : column.quickEdit;
 
         return quickEdit === false
-          ? omit(column, ['quickEdit'])
+          ? omit(column, ["quickEdit"])
           : {
               ...column,
               quickEdit: {
-                type: 'text',
+                type: "text",
                 ...quickEdit,
                 saveImmediately: true,
-                mode: 'inline'
+                mode: "inline"
               }
             };
       });
@@ -497,10 +497,10 @@ export default class FormTable extends React.Component<TableProps, TableState> {
 
     if (btns.length) {
       columns.push({
-        type: 'operation',
+        type: "operation",
         buttons: btns,
         width: 100,
-        label: '操作'
+        label: "操作"
       });
     }
 
@@ -562,7 +562,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
 
   getEntryId(entry: any) {
     if (entry === this.state.editting) {
-      return 'editting';
+      return "editting";
     } else if (!this.entries.has(entry)) {
       this.entries.set(entry, this.entityId++);
     }
@@ -580,15 +580,16 @@ export default class FormTable extends React.Component<TableProps, TableState> {
       placeholder,
       draggable,
       addable,
-      columnsTogglable
+      columnsTogglable,
+      combineNum
     } = this.props;
 
     return (
-      <div className={cx('form-control-table', className)}>
+      <div className={cx("form-control-table", className)}>
         {render(
-          'body',
+          "body",
           {
-            type: 'table',
+            type: "table",
             placeholder,
             columns: this.state.columns,
             affixHeader: false
@@ -611,7 +612,8 @@ export default class FormTable extends React.Component<TableProps, TableState> {
             onSaveOrder: this.handleSaveTableOrder,
             buildItemProps: this.buildItemProps,
             quickEditFormRef: this.subFormRef,
-            columnsTogglable: columnsTogglable
+            columnsTogglable: columnsTogglable,
+            combineNum: combineNum
           }
         )}
       </div>
@@ -621,6 +623,6 @@ export default class FormTable extends React.Component<TableProps, TableState> {
 
 @FormItem({
   test: /(^|\/)form(?:\/.+)?\/control\/table$/,
-  name: 'table-control'
+  name: "table-control"
 })
 export class TableControlRenderer extends FormTable {}