Merge branch 'master' into positec

king

2023-01-05 bc00d800cf4178e0c20e956b50944d177c6d50a6

Merge branch 'master' into positec

 src/menu/modalconfig/index.jsx

@@ -499,7 +499,7 @@
            <Card title="表单配置" bordered={false} extra={
              <div>
                <Button type="danger" onClick={this.clearConfig}>清空</Button>
                <EditComponent options={['form']} config={this.state.config} plusFields={this.plusFields}/>
                <EditComponent options={['form']} type="formboard" config={this.state.config} plusFields={this.plusFields}/>
                <Button type="primary" id="save-modal-config" loading={saving} onClick={this.submitConfig}>保存</Button>
                <Button onClick={this.cancelConfig}>返回</Button>
              </div>

 src/tabviews/custom/components/table/normal-table/index.scss

@@ -12,6 +12,7 @@
  >.button-list.toolbar-button {
    min-height: 60px;
    padding-right: 60px;
    line-height: 40px;
    button {
      margin-right: 0px;
      margin-bottom: 0px;

 src/templates/modalconfig/index.jsx

@@ -783,7 +783,7 @@
                <Button type="danger" onClick={this.clearConfig}>清空</Button>
                <Versions MenuId={editAction.uuid} open_edition={openEdition} updateConfig={this.refreshConfig}/>
                <ReplaceField type="form" config={config} updateConfig={this.updateconfig}/>
                <EditComponent options={['form']} config={this.state.config} plusFields={this.plusFields}/>
                <EditComponent options={['form']} type="formboard" config={this.state.config} plusFields={this.plusFields}/>
                <Button type="primary" id="save-config" onClick={this.submitConfig} loading={this.state.menuloading}>保存</Button>
                <Button onClick={this.cancelConfig}>返回</Button>
              </div>

 src/templates/zshare/editcomponent/index.jsx

@@ -119,6 +119,9 @@
    let _config = fromJS(this.props.config).toJS()

    this.pasteFormRef.handleConfirm().then(res => {
      if (type === 'formboard' && res.copyType === 'search' && ['text', 'select', 'multiselect', 'link', 'checkcard', 'date', 'datemonth'].includes(res.type)) {
        res.copyType = 'form'
      }
      if (!options.includes(res.copyType)) {
        notification.warning({
          top: 92,