Commit 5e110fdb8295bb5264a287a18c2a665fbeca8745

Authored by fengwotao
1 parent 97abdc28

pref: 移除脚本管理中的保留原始数据

@@ -46,15 +46,6 @@ @@ -46,15 +46,6 @@
46 /> 46 />
47 </a-space> 47 </a-space>
48 </a-form-item> 48 </a-form-item>
49 - <a-form-item  
50 - label="保存原始数据"  
51 - name="saveOriginalData"  
52 - :rules="[{ required: true, message: '请选择保存原始数据' }]"  
53 - >  
54 - <a-space direction="vertical">  
55 - <a-radio-group v-model:value="scriptForm.saveOriginalData" :options="originalOptions" />  
56 - </a-space>  
57 - </a-form-item>  
58 <a-form-item label="脚本内容" :name="ifAdd ? 'convertJs' : 'script'"> 49 <a-form-item label="脚本内容" :name="ifAdd ? 'convertJs' : 'script'">
59 <Card title="脚本内容" :bodyStyle="{ padding: 0, height: '280px' }"> 50 <Card title="脚本内容" :bodyStyle="{ padding: 0, height: '280px' }">
60 <template #extra> 51 <template #extra>
@@ -111,7 +102,7 @@ @@ -111,7 +102,7 @@
111 </div> 102 </div>
112 </template> 103 </template>
113 <script setup lang="ts"> 104 <script setup lang="ts">
114 - import { ref, unref, reactive, onMounted, toRefs, nextTick, computed } from 'vue'; 105 + import { ref, unref, reactive, onMounted, toRefs, computed } from 'vue';
115 import ace from 'ace-builds'; 106 import ace from 'ace-builds';
116 import { Card, Button, Tooltip } from 'ant-design-vue'; 107 import { Card, Button, Tooltip } from 'ant-design-vue';
117 import 'ace-builds/src-noconflict/theme-chrome'; // 默认设置的主题 108 import 'ace-builds/src-noconflict/theme-chrome'; // 默认设置的主题
@@ -149,15 +140,13 @@ @@ -149,15 +140,13 @@
149 params: '', 140 params: '',
150 output: '', 141 output: '',
151 scriptType: 'TRANSPORT_TCP_UP', 142 scriptType: 'TRANSPORT_TCP_UP',
152 - saveOriginalData: 'true',  
153 }); 143 });
154 144
155 const reportTypeOptions = reactive({ 145 const reportTypeOptions = reactive({
156 - originalOptions: [],  
157 scriptTypeOptions: [], 146 scriptTypeOptions: [],
158 }); 147 });
159 148
160 - const { originalOptions, scriptTypeOptions } = toRefs(reportTypeOptions); 149 + const { scriptTypeOptions } = toRefs(reportTypeOptions);
161 150
162 const { createMessage } = useMessage(); 151 const { createMessage } = useMessage();
163 152
@@ -171,8 +160,7 @@ @@ -171,8 +160,7 @@
171 160
172 const getAceClass = computed((): string => userStore.getDarkMode); 161 const getAceClass = computed((): string => userStore.getDarkMode);
173 162
174 - const setDefaultRadio = (p2, p3) => {  
175 - scriptForm.saveOriginalData = p2; 163 + const setDefaultRadio = (p3) => {
176 scriptForm.scriptType = p3; 164 scriptForm.scriptType = p3;
177 }; 165 };
178 166
@@ -186,7 +174,6 @@ @@ -186,7 +174,6 @@
186 }; 174 };
187 175
188 onMounted(async () => { 176 onMounted(async () => {
189 - reportTypeOptions.originalOptions = (await getDictValue('original_data')) as never as any;  
190 reportTypeOptions.scriptTypeOptions = (await getDictValue('script_type')) as never as any; 177 reportTypeOptions.scriptTypeOptions = (await getDictValue('script_type')) as never as any;
191 }); 178 });
192 179
@@ -273,7 +260,6 @@ @@ -273,7 +260,6 @@
273 ...value, 260 ...value,
274 ...{ convertJs: props.ifAdd ? scriptForm.convertJs : null }, 261 ...{ convertJs: props.ifAdd ? scriptForm.convertJs : null },
275 ...{ script: !props.ifAdd ? scriptForm.script : null }, 262 ...{ script: !props.ifAdd ? scriptForm.script : null },
276 - ...{ saveOriginalData: scriptForm.saveOriginalData === 'false' ? false : true },  
277 }; 263 };
278 }; 264 };
279 265
@@ -293,11 +279,6 @@ @@ -293,11 +279,6 @@
293 for (let i in scriptForm) { 279 for (let i in scriptForm) {
294 Reflect.set(scriptForm, i, v[i]); 280 Reflect.set(scriptForm, i, v[i]);
295 } 281 }
296 - nextTick(() => {  
297 - setTimeout(() => {  
298 - scriptForm.saveOriginalData = v.saveOriginalData === false ? 'false' : 'true';  
299 - }, 10);  
300 - });  
301 aceEditor.value.setValue(v.convertJs); 282 aceEditor.value.setValue(v.convertJs);
302 handleFormat(); 283 handleFormat();
303 } 284 }
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 : '测试转换脚本'; 62 : '测试转换脚本';
63 const okText = isText.value == 'test' ? '测试' : '确定'; 63 const okText = isText.value == 'test' ? '测试' : '确定';
64 if (unref(isTitle) == 'add') { 64 if (unref(isTitle) == 'add') {
65 - converScriptRef.value?.setDefaultRadio('true', 'TRANSPORT_TCP_UP'); 65 + converScriptRef.value?.setDefaultRadio('TRANSPORT_TCP_UP');
66 } 66 }
67 if (unref(isTitle) == 'edit') { 67 if (unref(isTitle) == 'edit') {
68 converScriptRef.value?.setFormData(data.record); 68 converScriptRef.value?.setFormData(data.record);
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 const res = await getScriptManageDetail(data.record); 72 const res = await getScriptManageDetail(data.record);
73 converScriptRef.value?.setFormData(res); 73 converScriptRef.value?.setFormData(res);
74 } else { 74 } else {
75 - converScriptRef.value?.setDefaultRadio('true', 'TRANSPORT_TCP_UP'); 75 + converScriptRef.value?.setDefaultRadio('TRANSPORT_TCP_UP');
76 } 76 }
77 } 77 }
78 setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText }); 78 setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText });
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 : '测试转换脚本'; 62 : '测试转换脚本';
63 const okText = isText.value == 'test' ? '测试' : '确定'; 63 const okText = isText.value == 'test' ? '测试' : '确定';
64 if (unref(isTitle) == 'add') { 64 if (unref(isTitle) == 'add') {
65 - converScriptRef.value?.setDefaultRadio('true', 'TRANSPORT_TCP_UP'); 65 + converScriptRef.value?.setDefaultRadio('TRANSPORT_TCP_UP');
66 } 66 }
67 if (unref(isTitle) == 'edit') { 67 if (unref(isTitle) == 'edit') {
68 converScriptRef.value?.setFormData(data.record); 68 converScriptRef.value?.setFormData(data.record);
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 converScriptRef.value?.setFormData({ ...res, convertJs: data?.testContent }); 73 converScriptRef.value?.setFormData({ ...res, convertJs: data?.testContent });
74 } else { 74 } else {
75 converScriptRef.value?.setFormData({ convertJs: data?.testContent }); 75 converScriptRef.value?.setFormData({ convertJs: data?.testContent });
76 - converScriptRef.value?.setDefaultRadio('true', 'TRANSPORT_TCP_UP'); 76 + converScriptRef.value?.setDefaultRadio('TRANSPORT_TCP_UP');
77 } 77 }
78 } 78 }
79 setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText }); 79 setModalProps({ title, showOkBtn: true, showCancelBtn: true, okText });