2020-08-31

king

2020-08-31 b3547d1c531e479021219fda5df153a11b9b52a3

 src/templates/sharecomponent/columncomponent/index.jsx

@@ -355,8 +355,6 @@

    confirm({
      content: dict['model.confirm'] + dict['model.delete'] + ` - ${card.label} ？`,
      okText: dict['model.confirm'],
      cancelText: this.state.dict['model.cancel'],
      onOk() {
        let _columnlist = fromJS(_this.state.columnlist).toJS()

@@ -578,7 +576,7 @@
        </Modal>
        {/* 合并列编辑 */}
        <Modal
          title={dict['model.modal.colspan'] + '-' + dict['model.edit']}
          title={dict['model.form.colspan'] + '-' + dict['model.edit']}
          visible={modaltype === 'colspan'}
          width={800}
          maskClosable={false}