src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -93,6 +93,16 @@ label: card.label + '（下一行）' }) if (wrap.commit === 'change') { editCols.push({ field: '$noActX', label: '无动作', disabled: card.editType !== 'select' }) } else if (card.enter === '$noActX') { card.enter = '$noAct' } return [ { type: 'text', src/menu/components/table/edit-table/columns/editColumn/index.jsx
@@ -217,6 +217,21 @@ } } else if (key === 'format' && value === 'percent') { this.props.form.setFieldsValue({postfix: '%'}) } else if (key === 'editType') { let _options = this.getOptions() this.setState({ formlist: this.state.formlist.map(item => { if (item.key === 'enter' && item.options && item.options[item.options.length - 1].field === '$noActX') { item.options[item.options.length - 1].disabled = value !== 'select' } item.initVal = this.record[item.key] item.hidden = !_options.includes(item.key) return item }) }) } else if (['editable', 'editType', 'resourceType', 'ctrlField', 'eval', 'Hide', 'IsSort'].includes(key)) { let _options = this.getOptions() @@ -331,7 +346,7 @@ getPopupContainer={() => document.getElementById('edit-table-column-winter')} > {options.map((option, i) => <Select.Option key={i} datatype={option.datatype || ''} label={option.label || ''} value={(option.value || option.field || option.MenuID)}> <Select.Option key={i} disabled={option.disabled === true} datatype={option.datatype || ''} label={option.label || ''} value={(option.value || option.field || option.MenuID)}> {(option.text || option.label || option.MenuName)} </Select.Option> )} @@ -521,6 +536,12 @@ } } if (values.type === 'text' && values.editable === 'true') { if (values.editType !== 'select' && values.enter === '$noActX') { values.enter = '$noAct' } } if (values.dataSource) { let pass = checkSQL(values.dataSource)
@@ -55,7 +55,7 @@ this.node.blur() if (config.enter === '$noAct') return if (/\$noAct/.test(config.enter)) return if (/\$next/.test(config.enter)) { MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', '')) @@ -191,7 +191,7 @@ this.props.onChange(values) if (config.enter === '$noAct') return if (/\$noAct/.test(config.enter)) return if (/\$next/.test(config.enter)) { MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', '')) @@ -283,9 +283,11 @@ this.props.onChange(values, val) if (config.enter === '$noActX') return this.node.blur() if (config.enter === '$noAct') return if (/\$noAct/.test(config.enter)) return setTimeout(() => { if (/\$next/.test(config.enter)) { @@ -408,7 +410,7 @@ this.node.blur() if (config.enter === '$noAct') return if (/\$noAct/.test(config.enter)) return if (/\$next/.test(config.enter)) { MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', '')) @@ -536,7 +538,7 @@ this.node.blur() if (config.enter === '$noAct') return if (/\$noAct/.test(config.enter)) return setTimeout(() => { if (/\$next/.test(config.enter)) { src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
@@ -292,7 +292,7 @@ this.props.onBlur && this.props.onBlur() if (config.enter === '$noAct') return if (/\$noAct/.test(config.enter)) return setTimeout(() => { if (/\$next/.test(config.enter)) {
