2020-12-03

king

2020-12-03 e739b47d88c14c2d83ad400d74241f9396e5d7cc

2020-12-03

 src/components/barcode/index.scss

@@ -1,6 +1,7 @@
.barcode-box {
  overflow-y: hidden;
  height: 100%;
  float: left;
  svg {
    vertical-align: top;
  }

 src/menu/actioncomponent/actionform/index.jsx

@@ -58,9 +58,6 @@
      text: this.props.dict['header.form.action.audit']
    }],
    deleteOptions: [{
      value: '',
      text: this.props.dict['model.empty']
    }, {
      value: 'LogicDelete',
      text: this.props.dict['header.form.action.LogicDelete']
    }, {

 src/menu/components/card/cardcellcomponent/index.jsx

@@ -69,6 +69,10 @@
      this.setState({
        elements: fromJS(nextProps.elements).toJS()
      })
    } else if (nextProps.elements.length === 0 && this.state.elements.length > 0) {
      this.setState({
        elements: []
      })
    }
  }


 src/menu/components/table/normal-table/cardcomponent/index.jsx

File was deleted

 src/menu/components/table/normal-table/cardcomponent/index.scss

 src/menu/components/table/normal-table/cardcomponent/settingform/index.jsx

File was deleted

 src/menu/components/table/normal-table/cardcomponent/settingform/index.scss

File was deleted

 src/menu/components/table/normal-table/columns/index.jsx

@@ -131,7 +131,7 @@

    if (column && column.type === 'custom') {
      return (
        <td style={{padding: 0, verticalAlign: 'top', minWidth: column.Width || 100}} className={className}>
        <td style={{padding: 0, minWidth: column.Width || 100}} className={className}>
          <CardCellComponent cards={config} cardCell={column} elements={column.elements} updateElement={this.updateCard}/>
        </td>
      )

 src/menu/components/table/normal-table/columns/index.scss

@@ -2,7 +2,15 @@
  .ant-table-body {
    overflow-x: auto;
    padding-bottom: 20px;
    tr td:not(.ant-table-selection-column) {
      padding: 12px 8px;
      background: #ffffff;
    }
    tr:hover td {
      background: #ffffff!important;
    }
  }

  .ant-table-thead {
    th {
      position: relative;
@@ -15,9 +23,12 @@
        content: '';
      }
    }
    > tr > th .ant-table-column-sorter .ant-table-column-sorter-inner {
      .ant-table-column-sorter-up.on, .ant-table-column-sorter-down.on {
        color: unset;
    > tr > th {
      padding: 12px 8px;
      .ant-table-column-sorter .ant-table-column-sorter-inner {
        .ant-table-column-sorter-up.on, .ant-table-column-sorter-down.on {
          color: unset;
        }
      }
    }
  }

 src/tabviews/zshare/normalTable/index.scss

@@ -22,9 +22,9 @@
      tr {
        th {
          position: relative;
          .ant-table-column-title {
            white-space: nowrap;
          }
          // .ant-table-column-title {
          //   white-space: nowrap;
          // }
        }
      }
    }