Commit 453d1c5a by zhaochengxiang

修改bug

parent 1a56e718
......@@ -87,7 +87,6 @@ const FC = (props) => {
setConfirmLoading(false);
reset();
LocalStorage.set('modelId', data.id||'');
LocalStorage.set('modelChange', !(LocalStorage.get('modelChange')||false));
onCancel?.(true);
......
......@@ -312,7 +312,7 @@ const EditModel = (props) => {
!modelerData?.inheritedFromEasyDataModelerDataModel && <Button type='primary' onClick={() => {
setActionData({ ...actionData, action: 'edit-inherited' });
actionRef.current = 'edit-inherited';
setEditInheritedParms({visible: true, modelerData})
setEditInheritedParms({visible: true, modelerData});
}} danger >
编辑历史存储形式
</Button>
......
......@@ -537,7 +537,7 @@ const ImportAction = (props) => {
<Spin spinning={loading}>
<ImportActionHeader
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||{}}
constraints={constraints}
templates={templates}
......@@ -556,7 +556,7 @@ const ImportAction = (props) => {
validateReports={validateReports}
supportedDatatypes={supportedDatatypes}
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}
originAction={getQueryParam(Action, props?.location?.search)}
terms={terms}
......@@ -568,7 +568,7 @@ const ImportAction = (props) => {
types={supportedIndextypes}
validateReports={validateReports}
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}
/>
</Spin>
......
......@@ -1329,7 +1329,7 @@ export const ImportActionTable = (props) => {
rowParams = {...rowParams, onClick: (event) => {
event.stopPropagation();
if (record.inherited || record.provided) {
showMessage('warn', '衍生表中自动生成的字段不允许编辑');
showMessage('warn', '请到对应的当前表修改');
} else {
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