Commit 9c8188fd61807afb1930acf2c12e77985edefdde

Authored by xp.Huang
2 parents 3502b7d0 4cf101f9

Merge branch 'fix/DEFECT-1772' into 'main_dev'

fix: 修复场景联动查看后新增确认按钮丢失

See merge request yunteng/thingskit-front!1026
@@ -29,9 +29,8 @@ @@ -29,9 +29,8 @@
29 (data: SceneLinkageDrawerDataType) => { 29 (data: SceneLinkageDrawerDataType) => {
30 const { mode, record } = data; 30 const { mode, record } = data;
31 drawerMode.value = mode; 31 drawerMode.value = mode;
32 - resetFieldsValue?.();  
33 -  
34 disabledDrawer.value = mode === DataActionModeEnum.READ; 32 disabledDrawer.value = mode === DataActionModeEnum.READ;
  33 + resetFieldsValue?.();
35 34
36 if (mode === DataActionModeEnum.UPDATE || mode === DataActionModeEnum.READ) { 35 if (mode === DataActionModeEnum.UPDATE || mode === DataActionModeEnum.READ) {
37 currentUpdateLinkedgeId.value = record.id; 36 currentUpdateLinkedgeId.value = record.id;
@@ -42,6 +41,11 @@ @@ -42,6 +41,11 @@
42 setDrawerProps({ loading: false }); 41 setDrawerProps({ loading: false });
43 }, 300); 42 }, 300);
44 } 43 }
  44 +
  45 + setDrawerProps({
  46 + showOkBtn: !unref(disabledDrawer),
  47 + cancelText: unref(disabledDrawer) ? '关闭' : '取消',
  48 + });
45 } 49 }
46 ); 50 );
47 51
@@ -111,8 +115,6 @@ @@ -111,8 +115,6 @@
111 :title="getDrawTitle" 115 :title="getDrawTitle"
112 width="50%" 116 width="50%"
113 @ok="handleSave" 117 @ok="handleSave"
114 - :show-ok-btn="!disabledDrawer"  
115 - :cancel-text="disabledDrawer ? '关闭' : '取消'"  
116 show-cancel-btn 118 show-cancel-btn
117 show-footer 119 show-footer
118 > 120 >