2022-03-24

king

2022-03-24 9a5a807c84fe0f9672ce01601fe9869c4954011b

2022-03-24

 src/menu/components/form/normal-form/index.jsx

@@ -721,7 +721,8 @@
        <Modal
          title={this.state.dict['model.edit']}
          visible={this.state.visible}
          width={850}
          width={950}
          maskClosable={false}
          onCancel={this.editModalCancel}
          onOk={this.handleSubmit}
          confirmLoading={this.state.sqlVerifing}

 src/menu/components/form/tab-form/index.jsx

@@ -729,7 +729,8 @@
        <Modal
          title={this.state.dict['model.edit']}
          visible={this.state.visible}
          width={850}
          width={950}
          maskClosable={false}
          onCancel={this.editModalCancel}
          onOk={this.handleSubmit}
          confirmLoading={this.state.sqlVerifing}

 src/menu/modalconfig/index.jsx

@@ -518,7 +518,8 @@
        <Modal
          title={this.state.dict['model.edit']}
          visible={this.state.visible}
          width={850}
          width={950}
          maskClosable={false}
          onCancel={this.editModalCancel}
          onOk={this.handleSubmit}
          confirmLoading={this.state.sqlVerifing}

 src/mob/components/tabs/antv-tabs/index.jsx

@@ -340,6 +340,7 @@
    // editab.hasSearch = res.hasSearch || ''
    editab.hide = res.hide || 'false'
    editab.backgroundColor = res.backgroundColor
    editab.controlVal = res.controlVal || ''
    editab.blacklist = res.blacklist

    if (editab.uuid) {

 src/mob/modalconfig/index.jsx

@@ -465,7 +465,8 @@
        <Modal
          title={this.state.dict['model.edit']}
          visible={this.state.visible}
          width={850}
          width={950}
          maskClosable={false}
          onCancel={this.editModalCancel}
          onOk={this.handleSubmit}
          confirmLoading={this.state.sqlVerifing}

 src/tabviews/custom/components/tabs/antv-tabs/index.jsx

@@ -30,8 +30,14 @@
  UNSAFE_componentWillMount () {
    const { config, bids } = this.props

    let _tabs = fromJS(config).toJS()

    if (_tabs.setting.supModule) {
      _tabs.subtabs = []
    }

    this.setState({
      tabs: fromJS(config).toJS(),
      tabs: _tabs,
      parentIds: config.parentIds || [],
      bids: bids ? bids : {}
    })
@@ -71,12 +77,12 @@
    }

    if (tabs.setting.supModule === MenuID) {
      if (!data || data[tabs.setting.controlField] === undefined) {
      if (!data) {
        this.setState({
          tabs: {...tabs, subtabs: this.props.config.subtabs}
          tabs: {...tabs, subtabs: []}
        })
      } else {
        let val = data[tabs.setting.controlField] + ''
        let val = data[tabs.setting.controlField] === undefined ? '' : data[tabs.setting.controlField] + ''
        this.setState({
          tabs: {...tabs, subtabs: this.props.config.subtabs.filter(tab => {
            if (tab.controlVal === val) {
@@ -119,6 +125,8 @@
    const { mainSearch, BID } = this.props
    const { tabs, bids } = this.state

    if (!tabs.subtabs.length) return null

    return (
      <div className={'menu-antv-tabs-wrap ' + tabs.setting.tabLabel} style={tabs.style}>
        <Tabs defaultActiveKey="1" tabBarStyle={{background: tabs.setting.backgroundColor || 'transparent'}} tabPosition={tabs.setting.position} type={tabs.setting.tabStyle}>

 src/templates/formtabconfig/index.jsx

@@ -1942,7 +1942,7 @@
        <Modal
          title={this.state.card && this.state.card.iscopy ? '表单-复制' : '表单-编辑'}
          visible={modaltype === 'search'}
          width={700}
          width={950}
          maskClosable={false}
          onOk={this.handleSubmit}
          confirmLoading={this.state.sqlVerifing}

 src/templates/modalconfig/index.jsx

@@ -805,7 +805,7 @@
        <Modal
          title={dict['model.edit']}
          visible={this.state.visible}
          width={850}
          width={950}
          maskClosable={false}
          onCancel={this.editModalCancel}
          onOk={this.handleSubmit}

 src/templates/zshare/modalform/datatable/index.jsx

@@ -118,7 +118,7 @@
    return (
      <td {...restProps}>
        {editing ? (
          <Form.Item style={{ margin: 0 }}>
          <Form.Item style={{ margin: '0 -5px 0 -5px' }}>
            {getFieldDecorator(dataIndex, {
              rules: [
                {

 src/templates/zshare/modalform/datatable/index.scss

@@ -18,7 +18,7 @@
      line-height: 1;
    }
    > td {
      padding: 16px 10px;
      padding: 13px 10px;
    }
    .fileupload-form-container .ant-upload-list-picture-card .ant-upload-list-item {
      margin: 0;
@@ -27,6 +27,9 @@
        height: 100%;
      }
    }
    .ant-input {
      padding: 0 5px;
    }
  }
  .editable-row.hide {
    td:not(:last-child) {

 src/templates/zshare/modalform/modaleditable/index.jsx

@@ -67,7 +67,7 @@
    }

    return editing ? (
      <Form.Item style={{ margin: 0 }}>
      <Form.Item style={{ margin: '0 -5px 0 -5px' }}>
        {form.getFieldDecorator(dataIndex, {
          rules: [
            {

 src/templates/zshare/modalform/modaleditable/index.scss

@@ -19,7 +19,7 @@
    padding: 10px 16px;
  }
  .ant-table-tbody > tr > td {
    padding: 5px 16px;
    padding: 5px 10px;
  }
  .editable-cell-value-wrap {
    cursor: pointer;
@@ -29,10 +29,9 @@
    vertical-align: middle;
    word-wrap: break-word;
    word-break: break-word;
    .ant-input {
      height: 30px;
      padding: 0 11px;
    }
  .ant-input {
    padding: 0 5px;
  }
  .ant-form-item-control-wrapper {
    width: 100%;