Commit fa330741fb71115d30c33afc85db157af91613cb
1 parent
499d2b8a
fix:DEFECT-940 转换函数保存原始数据设置为是,然后点击编辑和查看时,从否跳转为是
Showing
2 changed files
with
10 additions
and
4 deletions
... | ... | @@ -103,7 +103,7 @@ |
103 | 103 | params: '', |
104 | 104 | output: '', |
105 | 105 | dataType: 'HEX', |
106 | - saveOriginalData: 'false', | |
106 | + saveOriginalData: 'true', | |
107 | 107 | }); |
108 | 108 | const reportTypeOptions = reactive({ |
109 | 109 | typeOptions: [], |
... | ... | @@ -114,6 +114,10 @@ |
114 | 114 | const { clipboardRef, copiedRef } = useCopyToClipboard(); |
115 | 115 | const aceEditor = ref(); |
116 | 116 | const aceRef = ref(); |
117 | + const setDefaultRadio = (p1, p2) => { | |
118 | + scriptForm.dataType = p1; | |
119 | + scriptForm.saveOriginalData = p2; | |
120 | + }; | |
117 | 121 | onMounted(async () => { |
118 | 122 | const res: any = await findDictItemByCode({ |
119 | 123 | dictCode: 'report_data_type', |
... | ... | @@ -127,8 +131,6 @@ |
127 | 131 | reportTypeOptions.originalOptions = resOriginal.map((m) => { |
128 | 132 | return { label: m.itemText, value: m.itemValue }; |
129 | 133 | }); |
130 | - scriptForm.dataType = 'HEX'; | |
131 | - scriptForm.saveOriginalData = 'true'; | |
132 | 134 | }); |
133 | 135 | // 初始化编辑器 |
134 | 136 | const initEditor = (jsScript?: string) => { |
... | ... | @@ -202,7 +204,7 @@ |
202 | 204 | setTimeout(() => { |
203 | 205 | scriptForm.saveOriginalData = v.saveOriginalData === false ? 'false' : 'true'; |
204 | 206 | scriptForm.dataType = v.dataType; |
205 | - }, 500); | |
207 | + }, 10); | |
206 | 208 | }); |
207 | 209 | aceEditor.value.setValue(v.convertJs); |
208 | 210 | handleFormat(); |
... | ... | @@ -229,6 +231,7 @@ |
229 | 231 | setFormData, |
230 | 232 | setScriptContentData, |
231 | 233 | setScriptOutputData, |
234 | + setDefaultRadio, | |
232 | 235 | }); |
233 | 236 | </script> |
234 | 237 | <style lang="less" scoped> | ... | ... |
... | ... | @@ -56,6 +56,9 @@ |
56 | 56 | ? '新增转换脚本' |
57 | 57 | : '测试转换脚本'; |
58 | 58 | const okText = isText.value == 'test' ? '测试' : '确定'; |
59 | + if (unref(isTitle) == 'add') { | |
60 | + converScriptRef.value?.setDefaultRadio('HEX', 'true'); | |
61 | + } | |
59 | 62 | if (unref(isTitle) == 'edit') { |
60 | 63 | converScriptRef.value?.setFormData(data.record); |
61 | 64 | } | ... | ... |