Commit 453d1c5a by zhaochengxiang

修改bug

parent 1a56e718
...@@ -87,7 +87,6 @@ const FC = (props) => { ...@@ -87,7 +87,6 @@ const FC = (props) => {
setConfirmLoading(false); setConfirmLoading(false);
reset(); reset();
LocalStorage.set('modelId', data.id||'');
LocalStorage.set('modelChange', !(LocalStorage.get('modelChange')||false)); LocalStorage.set('modelChange', !(LocalStorage.get('modelChange')||false));
onCancel?.(true); onCancel?.(true);
......
...@@ -312,7 +312,7 @@ const EditModel = (props) => { ...@@ -312,7 +312,7 @@ const EditModel = (props) => {
!modelerData?.inheritedFromEasyDataModelerDataModel && <Button type='primary' onClick={() => { !modelerData?.inheritedFromEasyDataModelerDataModel && <Button type='primary' onClick={() => {
setActionData({ ...actionData, action: 'edit-inherited' }); setActionData({ ...actionData, action: 'edit-inherited' });
actionRef.current = 'edit-inherited'; actionRef.current = 'edit-inherited';
setEditInheritedParms({visible: true, modelerData}) setEditInheritedParms({visible: true, modelerData});
}} danger > }} danger >
编辑历史存储形式 编辑历史存储形式
</Button> </Button>
......
...@@ -537,7 +537,7 @@ const ImportAction = (props) => { ...@@ -537,7 +537,7 @@ const ImportAction = (props) => {
<Spin spinning={loading}> <Spin spinning={loading}>
<ImportActionHeader <ImportActionHeader
form={form} form={form}
editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherite'} editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherited'}
modelerData={modelerData||{}} modelerData={modelerData||{}}
constraints={constraints} constraints={constraints}
templates={templates} templates={templates}
...@@ -556,7 +556,7 @@ const ImportAction = (props) => { ...@@ -556,7 +556,7 @@ const ImportAction = (props) => {
validateReports={validateReports} validateReports={validateReports}
supportedDatatypes={supportedDatatypes} supportedDatatypes={supportedDatatypes}
onChange={onTableChange} onChange={onTableChange}
editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherite'} editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherited'}
action={action} action={action}
originAction={getQueryParam(Action, props?.location?.search)} originAction={getQueryParam(Action, props?.location?.search)}
terms={terms} terms={terms}
...@@ -568,7 +568,7 @@ const ImportAction = (props) => { ...@@ -568,7 +568,7 @@ const ImportAction = (props) => {
types={supportedIndextypes} types={supportedIndextypes}
validateReports={validateReports} validateReports={validateReports}
onChange={onIndexChange} onChange={onIndexChange}
editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherite'} editable={action!=='detail'&&action!=='flow'&&action!=='detail-version'&&action!=='edit-inherited'}
terms={terms} terms={terms}
/> />
</Spin> </Spin>
......
...@@ -1329,7 +1329,7 @@ export const ImportActionTable = (props) => { ...@@ -1329,7 +1329,7 @@ export const ImportActionTable = (props) => {
rowParams = {...rowParams, onClick: (event) => { rowParams = {...rowParams, onClick: (event) => {
event.stopPropagation(); event.stopPropagation();
if (record.inherited || record.provided) { if (record.inherited || record.provided) {
showMessage('warn', '衍生表中自动生成的字段不允许编辑'); showMessage('warn', '请到对应的当前表修改');
} else { } else {
edit(record); edit(record);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment