~jinfei/pc-plat.git

			@@ -37,7 +37,7 @@
			pageIndex: 1, // 页码
			pageSize: 10, // 每页数据条数
			orderBy: '', // 排序
			search: '', // 搜索条件数组，使用时需分场景处理
			search: '' // 搜索条件数组，使用时需分场景处理
			}

			/**
			@@ -79,6 +79,7 @@
			let _columns = []
			setting.initId = ''
			let triMap = new Map()
			setting.hasSubmit = false

			let getColumns = (cols) => {
			return cols.filter(item => {
			@@ -115,6 +116,7 @@
			}

			if (item.editable === 'true') {
			setting.hasSubmit = true
			if (!setting.initId) {
			setting.initId = item.uuid
			}
			@@ -331,7 +333,6 @@
			})
			}

			try {
			data = data.map(item => {
			if (item.$$uuid === _data.$$uuid) {
			_data.key = item.key
			@@ -347,9 +348,6 @@
			}
			return item
			})
			} catch (e) {
			console.warn('数据查询错误')
			}

			MKEmitter.emit('transferData', config.uuid, _data, 'line')
			MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid, _data)
			@@ -376,24 +374,12 @@
			* 含有初始不加载的页面，修改设置
			*/
			refreshbysearch = (searches) => {
			const { setting } = this.state

			if (setting.onload === 'false') {
			this.setState({
			pageIndex: 1,
			search: searches,
			setting: {...setting, onload: 'true'}
			}, () => {
			this.loadmaindata()
			})
			} else {
			this.setState({
			pageIndex: 1,
			search: searches
			}, () => {
			this.loadmaindata(true, 'true')
			})
			}
			}

			/**
			@@ -516,6 +502,30 @@
			}
			}

			refreshLineData = (menuId, btn, uuid, count) => {
			const { config } = this.state

			if (config.uuid !== menuId) return

			let _data = fromJS(this.state.data).toJS().map(item => {
			if (item.$$uuid === uuid) {
			item[btn.field] = count
			}
			return item
			})
			let _selectedData = fromJS(this.state.selectedData).toJS().map(item => {
			if (item.$$uuid === uuid) {
			item[btn.field] = count
			}
			return item
			})

			this.setState({
			data: _data,
			selectedData: _selectedData
			})
			}

			UNSAFE_componentWillReceiveProps(nextProps) {
			const { config } = this.state

			@@ -534,6 +544,7 @@
			MKEmitter.addListener('reloadData', this.reloadData)
			MKEmitter.addListener('resetSelectLine', this.resetParentParam)
			MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
			MKEmitter.addListener('refreshLineData', this.refreshLineData)
			MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
			}

			@@ -547,6 +558,7 @@
			MKEmitter.removeListener('reloadData', this.reloadData)
			MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
			MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
			MKEmitter.removeListener('refreshLineData', this.refreshLineData)
			MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
			}

			@@ -559,7 +571,7 @@
			}

			return (
			<div className="custom-edit-table" id={'anchor' + config.uuid} style={style}>
			<div className={'custom-edit-table' + (setting.hasSubmit ? '' : ' withnot-submit')} id={'anchor' + config.uuid} style={style}>
			<NormalHeader config={config}/>
			{config.search && config.search.length ?
			<MainSearch BID={BID} config={config} refreshdata={this.refreshbysearch}/> : null