Skip to content

W
WebPublic
提交 9969181a authored 作者: 钟是志's avatar 钟是志
浏览文件
操作

27282 双选会报名后管理员修改举办时间 但是单位申请信息么有随着更新

上级 6425fd8c
隐藏空白字符变更
内嵌 并排
正在显示 包含 50 行增加 和 46 行删除
one_stop_public/Table/ZdyTable.jsx
浏览文件 @ 9969181a
...@@ -769,11 +769,6 @@ export default class ZdyTable extends Component { ...@@ -769,11 +769,6 @@ export default class ZdyTable extends Component {
updateTime = moment(+this.props.postData?.updateTime) updateTime = moment(+this.props.postData?.updateTime)
.format('llll'); .format('llll');
} }
if (this.props.currentFormKey === 'a05771be-44c9-4fd6-b579-f8d7b2133206') {
console.log(this);
}
switch (get) { switch (get) {
case 'web': case 'web':
// this.props.form.validateFields() // this.props.form.validateFields()
......
one_stop_public/Table/giveSmartFormGlobalProps.js
浏览文件 @ 9969181a
...@@ -9,8 +9,8 @@ import { ...@@ -9,8 +9,8 @@ import {
getColumnsDataRealize, getColumnsDataRealize,
getColumnsSqlKeyRealize, getColumnsSqlKeyRealize,
getWord, getWord,
renderContentAll, renderContentAll,
renderContentRow, renderContentRow,
} from './globalFunction'; } from './globalFunction';
export function giveSmartFormGlobalProps({ export function giveSmartFormGlobalProps({
...@@ -39,19 +39,24 @@ export function giveSmartFormGlobalProps({ ...@@ -39,19 +39,24 @@ export function giveSmartFormGlobalProps({
getColumnsDataRealize, getColumnsDataRealize,
getColumnsSqlKeyRealize, getColumnsSqlKeyRealize,
getWord, getWord,
renderContentAll, renderContentAll,
renderContentRow, renderContentRow,
remark: { remark: {
"giveFilePostDataInfoForTrue(params, url) ":`将接口参数 二进制文件化 并返回新的接口地址与参数';`, 'giveFilePostDataInfoForTrue(params, url) ': `将接口参数 二进制文件化 并返回新的接口地址与参数';`,
"getSpanJson(mergeKey, data, eliminateStr)":`列表获取纵向合并数据 ;参数-> mergeKey : 需要合并的表头key data : 列表数据 eliminateStr : 需要忽略合并的数据`, 'getSpanJson(mergeKey, data, eliminateStr)': `列表获取纵向合并数据 ;参数-> mergeKey : 需要合并的表头key data : 列表数据 eliminateStr : 需要忽略合并的数据`,
"getColumns(columns)":`获取ant表头的属性 ;参数->columns : ant的表头`, 'getColumns(columns)': `获取ant表头的属性 ;参数->columns : ant的表头`,
"getColumnsDataRealize({data, mergeKey, columns, styles, defect, fileName, ext , eliminateStr})":`下载列表合并的数据;参数-> 前三个必填data, mergeKey, columns`, 'getColumnsDataRealize({data, mergeKey, columns, styles, defect, fileName, ext , eliminateStr})': `下载列表合并的数据;参数-> 前三个必填data, mergeKey, columns`,
"getColumnsSqlKeyRealize({sqlKey, columns, styles, fileName, ext})":`下载列表表头合并的数据;参数->前两个个必填sqlKey, columns`, 'getColumnsSqlKeyRealize({sqlKey, columns, styles, fileName, ext})': `下载列表表头合并的数据;参数->前两个个必填sqlKey, columns`,
"getWord({templatePath,params, title, allValues, listConfig, ext})":`下载文档地址 ;参数->前五个必填 templatePath,params, title, allValues, listConfig`, 'getWord({templatePath,params, title, allValues, listConfig, ext})': `下载文档地址 ;参数->前五个必填 templatePath,params, title, allValues, listConfig`,
"renderContentAll(value, row, index, key, spanData, cloumnNames) ":`ant表头横向、纵向合并 ;参数->所有必填 value, row, index, key, spanData, cloumnNames 实例：render:(value, row, index)=>{return renderContentAll(value, row, index,"inst_name",spanData,cloumnNames)}`, 'renderContentAll(value, row, index, key, spanData, cloumnNames) ': `ant表头横向、纵向合并 ;参数->所有必填 value, row, index, key, spanData, cloumnNames 实例：render:(value, row, index)=>{return renderContentAll(value, row, index,"inst_name",spanData,cloumnNames)}`,
"renderContentRow(value, row, index, key, spanData, cloumnNames) ":`ant表头纵向合并 ;参数->所有必填 value, row, index, key, spanData, cloumnNames 实例：render:(value, row, index)=>{return renderContentRow(value, row, index,"inst_name",spanData,cloumnNames)}`, 'renderContentRow(value, row, index, key, spanData, cloumnNames) ': `ant表头纵向合并 ;参数->所有必填 value, row, index, key, spanData, cloumnNames 实例：render:(value, row, index)=>{return renderContentRow(value, row, index,"inst_name",spanData,cloumnNames)}`,
} },
}, },
activeJsonConfig: {
// id_aebaa1d428a722486f289d92e4979f318341: {
// disabled: true,
// },
}, // 27282 双选会报名后管理员修改举办时间 但是单位申请信息么有随着更新
publicComponent: { publicComponent: {
React, React,
Modal, Modal,
...@@ -65,4 +70,4 @@ export function giveSmartFormGlobalProps({ ...@@ -65,4 +70,4 @@ export function giveSmartFormGlobalProps({
}, },
}; };
return true; return true;
} }
\ No newline at end of file
one_stop_public/tableCompon/index.jsx
浏览文件 @ 9969181a
...@@ -107,7 +107,7 @@ const giveRender = (column = {}) => { ...@@ -107,7 +107,7 @@ const giveRender = (column = {}) => {
formList, formList,
loading: loading.models.DataColumn || loading.models.SqlManageEntity || loading.models.formList, loading: loading.models.DataColumn || loading.models.SqlManageEntity || loading.models.formList,
})) }))
export default class tableCom extends Component { export default class TableCom extends Component {
constructor(props) { constructor(props) {
super(props); super(props);
this.state = { this.state = {
...@@ -1462,7 +1462,7 @@ export default class tableCom extends Component { ...@@ -1462,7 +1462,7 @@ export default class tableCom extends Component {
* obj为查看详情用户输入值 * obj为查看详情用户输入值
*/ */
let { let {
json, json: jsonStatic,
obj, obj,
mapData, mapData,
init, init,
...@@ -1479,8 +1479,14 @@ export default class tableCom extends Component { ...@@ -1479,8 +1479,14 @@ export default class tableCom extends Component {
isPreview, isPreview,
currentFormTitle, currentFormTitle,
getCellValue, getCellValue,
uuid,
} = this.props; } = this.props;
// console.log(this.props.datas);
// 27282 双选会报名后管理员修改举办时间 但是单位申请信息么有随着更新
const json = window.smartFormGlobalProps?.activeJsonConfig[uuid] ? {
...jsonStatic,
...window.smartFormGlobalProps?.activeJsonConfig[uuid],
} : jsonStatic;
const { const {
options, options,
labels, labels,
...@@ -1517,13 +1523,13 @@ export default class tableCom extends Component { ...@@ -1517,13 +1523,13 @@ export default class tableCom extends Component {
) { ) {
return <></>; return <></>;
} }
return <QRCode {...this.state.option} key={this.props.uuid}/>; return <QRCode {...this.state.option} key={uuid}/>;
} }
if (json.comName == 'Echart') { if (json.comName == 'Echart') {
return ( return (
<ReactEcharts <ReactEcharts
style={{ height: json.height || 500 }} style={{ height: json.height || 500 }}
key={this.props.uuid} key={uuid}
option={this.state.option || {}} option={this.state.option || {}}
notMerge={true} notMerge={true}
lazyUpdate={true} lazyUpdate={true}
...@@ -1533,11 +1539,11 @@ export default class tableCom extends Component { ...@@ -1533,11 +1539,11 @@ export default class tableCom extends Component {
); );
} }
if (json.comName == 'Graph') { if (json.comName == 'Graph') {
return <Neo4jD3Com key={this.props.uuid} json={json} option={this.state.option || []}/>; return <Neo4jD3Com key={uuid} json={json} option={this.state.option || []}/>;
} }
if (json.comName == 'PartForm') { if (json.comName == 'PartForm') {
const fk = this.props.form.getFieldsValue()[this.props.uuid] || json.childFormKey; const fk = this.props.form.getFieldsValue()[uuid] || json.childFormKey;
if (fk == null) { if (fk == null) {
return <></>; return <></>;
} }
...@@ -1546,7 +1552,7 @@ export default class tableCom extends Component { ...@@ -1546,7 +1552,7 @@ export default class tableCom extends Component {
} }
return ( return (
<> <>
{this.props.form.getFieldDecorator(this.props.uuid, { {this.props.form.getFieldDecorator(uuid, {
initialValue: fk, initialValue: fk,
})(<Input type="hidden"/>)} })(<Input type="hidden"/>)}
{' '} {' '}
...@@ -1612,18 +1618,18 @@ export default class tableCom extends Component { ...@@ -1612,18 +1618,18 @@ export default class tableCom extends Component {
if (json.comName === 'Label') { if (json.comName === 'Label') {
let uid; let uid;
if (this.props.fatherCode != null) { if (this.props.fatherCode != null) {
uid = `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}`; uid = `${this.props.fatherCode}.[${this.props.index}].${uuid}`;
} else { } else {
uid = this.props.uuid; uid = uuid;
} }
if (!isEdit) { if (!isEdit) {
return obj[this.props.uuid] || json.initialValue || ''; return obj[uuid] || json.initialValue || '';
} else { } else {
if (this.props.fatherCode != null) { if (this.props.fatherCode != null) {
return ( return (
<> <>
{this.props.form.getFieldDecorator(uid, { {this.props.form.getFieldDecorator(uid, {
initialValue: obj[this.props.uuid] || json.initialValue, initialValue: obj[uuid] || json.initialValue,
})(<Input type="hidden"/>)} })(<Input type="hidden"/>)}
<span <span
style={{ style={{
...@@ -1631,7 +1637,7 @@ export default class tableCom extends Component { ...@@ -1631,7 +1637,7 @@ export default class tableCom extends Component {
marginRight: get === 'mobile' ? 12 : '', marginRight: get === 'mobile' ? 12 : '',
}} }}
{...json.props}> {...json.props}>
{obj[this.props.uuid] || json.initialValue} {obj[uuid] || json.initialValue}
</span> </span>
</> </>
); );
...@@ -1991,11 +1997,11 @@ export default class tableCom extends Component { ...@@ -1991,11 +1997,11 @@ export default class tableCom extends Component {
...bindObj, ...bindObj,
base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`, base52: `${this.props.fatherCode}.[${this.props.index}].${bindObj.base52}`,
} }
: { base52: `${this.props.fatherCode}.[${this.props.index}].${this.props.uuid}` } : { base52: `${this.props.fatherCode}.[${this.props.index}].${uuid}` }
: bindObj; : bindObj;
if (this.props.fatherCode == null && dataColumn == null) { if (this.props.fatherCode == null && dataColumn == null) {
dataColumn = { base52: this.props.uuid }; dataColumn = { base52: uuid };
} }
if (dataColumn.isNull != null && !dataColumn.isNull) { if (dataColumn.isNull != null && !dataColumn.isNull) {
required = true; required = true;
...@@ -2009,7 +2015,7 @@ export default class tableCom extends Component { ...@@ -2009,7 +2015,7 @@ export default class tableCom extends Component {
if (this.props.fatherCode != null) { if (this.props.fatherCode != null) {
initValue = initValue =
objinit[this.props.index] != null objinit[this.props.index] != null
? objinit[this.props.index][bindObj ? bindObj.base52 : this.props.uuid] ? objinit[this.props.index][bindObj ? bindObj.base52 : uuid]
: null; : null;
} else { } else {
initValue = objinit[dataColumn.base52]; initValue = objinit[dataColumn.base52];
...@@ -2039,7 +2045,7 @@ export default class tableCom extends Component { ...@@ -2039,7 +2045,7 @@ export default class tableCom extends Component {
if (bindObj != null) { if (bindObj != null) {
dataColumn.base52 = bindObj.base52; dataColumn.base52 = bindObj.base52;
} else { } else {
dataColumn.base52 = this.props.uuid; dataColumn.base52 = uuid;
} }
} }
...@@ -2520,7 +2526,7 @@ ${obj[dataColumn.base52]} ...@@ -2520,7 +2526,7 @@ ${obj[dataColumn.base52]}
let events = {}; let events = {};
if (json.events != null) { if (json.events != null) {
events = this.getFunctionValue(json.events, { base52: this.props.uuid }, json); events = this.getFunctionValue(json.events, { base52: uuid }, json);
} }
if (events && events.dom) { if (events && events.dom) {
cm = events.dom; cm = events.dom;
...@@ -2566,7 +2572,7 @@ ${obj[dataColumn.base52]} ...@@ -2566,7 +2572,7 @@ ${obj[dataColumn.base52]}
showHeader={json.showHeader} showHeader={json.showHeader}
isHiddenPage={json.isHiddenPage} isHiddenPage={json.isHiddenPage}
pageSize={json.pageSize} pageSize={json.pageSize}
value={obj[dataColumn.base52 || this.props.uuid] || {}} value={obj[dataColumn.base52 || uuid] || {}}
objCode={json.objCode} objCode={json.objCode}
sql={json.filterSql} sql={json.filterSql}
rights={json.rights} rights={json.rights}
...@@ -2602,7 +2608,7 @@ ${obj[dataColumn.base52]} ...@@ -2602,7 +2608,7 @@ ${obj[dataColumn.base52]}
let events = {}; let events = {};
if (json.events != null) { if (json.events != null) {
events = this.getFunctionValue(json.events, { base52: this.props.uuid }, json); events = this.getFunctionValue(json.events, { base52: uuid }, json);
} }
if (events && events.dom) { if (events && events.dom) {
cm = events.dom; cm = events.dom;
...@@ -2622,7 +2628,7 @@ ${obj[dataColumn.base52]} ...@@ -2622,7 +2628,7 @@ ${obj[dataColumn.base52]}
case 'Switch': case 'Switch':
if (get === 'mobile') { if (get === 'mobile') {
if (dataColumn == null || json.formula != null) { if (dataColumn == null || json.formula != null) {
cm = this.props.form.getFieldsValue()[this.props.uuid]; cm = this.props.form.getFieldsValue()[uuid];
break; break;
} }
cm = ( cm = (
...@@ -3086,7 +3092,7 @@ ${obj[dataColumn.base52]} ...@@ -3086,7 +3092,7 @@ ${obj[dataColumn.base52]}
<Cascader // 这里的options 获取方式存在bug 公式会重复调用 <Cascader // 这里的options 获取方式存在bug 公式会重复调用
options={options} options={options}
allowClear allowClear
data-cell-uuid-cascader={this.props.uuid} data-cell-uuid-cascader={uuid}
showSearch={{ filter: filterF }} showSearch={{ filter: filterF }}
disabled={disabled} disabled={disabled}
getPopupContainer={ getPopupContainer={
...@@ -3195,7 +3201,7 @@ ${obj[dataColumn.base52]} ...@@ -3195,7 +3201,7 @@ ${obj[dataColumn.base52]}
const begin = dataColumn; const begin = dataColumn;
var end = this.getColumn('c2'); var end = this.getColumn('c2');
if (end == null) { if (end == null) {
end = { base52: this.props.uuid + '_2' }; end = { base52: uuid + '_2' };
} }
const ivs = getMomentArr({ const ivs = getMomentArr({
begin, begin,
...@@ -3466,7 +3472,7 @@ ${obj[dataColumn.base52]} ...@@ -3466,7 +3472,7 @@ ${obj[dataColumn.base52]}
json={json} json={json}
dataColumn={dataColumn} dataColumn={dataColumn}
disabled={disabled} disabled={disabled}
uuid={this.props.uuid} uuid={uuid}
/>, />,
); );
break; break;
...@@ -3720,7 +3726,7 @@ ${obj[dataColumn.base52]} ...@@ -3720,7 +3726,7 @@ ${obj[dataColumn.base52]}
} else { } else {
cm = ( cm = (
<> <>
{getFieldDecorator(dataColumn.base52 || this.props.uuid, { {getFieldDecorator(dataColumn.base52 || uuid, {
initialValue: initValue || {}, initialValue: initValue || {},
})( })(
<TableList <TableList
......
zyd_public/WangEditor/OneStopWangEditor.js
浏览文件 @ 9969181a
...@@ -52,7 +52,6 @@ export default function Index({ ...@@ -52,7 +52,6 @@ export default function Index({
editor.config.focus = focus; editor.config.focus = focus;
} }
editor.config.onchange = function(newHtml) { editor.config.onchange = function(newHtml) {
console.log(newHtml);
onChangeValue(newHtml); onChangeValue(newHtml);
}; };
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论