Commit 5fb5fef37678bc02c24674d6570829e3b6ef20ab
Merge branch 'ft' into 'main_dev'
fix: 修复Teambition上的问题 See merge request yunteng/thingskit-front!633
Showing
6 changed files
with
28 additions
and
9 deletions
@@ -319,7 +319,7 @@ | @@ -319,7 +319,7 @@ | ||
319 | if (props.value && !props.value.length) { | 319 | if (props.value && !props.value.length) { |
320 | selectedRowKeys.value = []; | 320 | selectedRowKeys.value = []; |
321 | selectedRows.value = []; | 321 | selectedRows.value = []; |
322 | - pendingTotal.value = 0; | 322 | + // pendingTotal.value = 0; |
323 | selectedTotal.value = 0; | 323 | selectedTotal.value = 0; |
324 | } | 324 | } |
325 | } | 325 | } |
@@ -175,7 +175,7 @@ | @@ -175,7 +175,7 @@ | ||
175 | Modal.info({ | 175 | Modal.info({ |
176 | title: '接口内容', | 176 | title: '接口内容', |
177 | width: 600, | 177 | width: 600, |
178 | - content: h(JsonPreview, { data: JSON.parse(record.requestParams) }), | 178 | + content: h(JsonPreview, { virtual: true, data: JSON.parse(record.requestParams) }), |
179 | }); | 179 | }); |
180 | }; | 180 | }; |
181 | 181 |
@@ -6,6 +6,7 @@ | @@ -6,6 +6,7 @@ | ||
6 | <div style="display: flex; align-items: center"> | 6 | <div style="display: flex; align-items: center"> |
7 | <div style="width: 245px"> | 7 | <div style="width: 245px"> |
8 | <a-tree-select | 8 | <a-tree-select |
9 | + @change="handleTreeOrg" | ||
9 | v-model:value="model[field]" | 10 | v-model:value="model[field]" |
10 | show-search | 11 | show-search |
11 | style="width: 100%" | 12 | style="width: 100%" |
@@ -417,6 +418,13 @@ | @@ -417,6 +418,13 @@ | ||
417 | }); | 418 | }); |
418 | } | 419 | } |
419 | 420 | ||
421 | + const handleTreeOrg = () => { | ||
422 | + const clearGatewayId = { | ||
423 | + gatewayId: '', | ||
424 | + }; | ||
425 | + setFieldsValue(clearGatewayId); | ||
426 | + }; | ||
427 | + | ||
420 | return { | 428 | return { |
421 | resetFields, | 429 | resetFields, |
422 | positionState, | 430 | positionState, |
@@ -449,6 +457,7 @@ | @@ -449,6 +457,7 @@ | ||
449 | registerModal, | 457 | registerModal, |
450 | handleOpenOrgDrawer, | 458 | handleOpenOrgDrawer, |
451 | handleSuccess, | 459 | handleSuccess, |
460 | + handleTreeOrg, | ||
452 | }; | 461 | }; |
453 | }, | 462 | }, |
454 | }); | 463 | }); |
@@ -167,9 +167,8 @@ | @@ -167,9 +167,8 @@ | ||
167 | }, | 167 | }, |
168 | }); | 168 | }); |
169 | }; | 169 | }; |
170 | - const updateDisabled = async (e) => { | 170 | + const updateDisabled = async () => { |
171 | await nextTick(); | 171 | await nextTick(); |
172 | - tcpRef.value?.updateDisabled(e); | ||
173 | }; | 172 | }; |
174 | defineExpose({ | 173 | defineExpose({ |
175 | getFormData, | 174 | getFormData, |
@@ -95,10 +95,11 @@ | @@ -95,10 +95,11 @@ | ||
95 | openModal(true, modalParams); | 95 | openModal(true, modalParams); |
96 | }; | 96 | }; |
97 | 97 | ||
98 | - const handleSuccess = ({ rest }) => { | 98 | + const handleSuccess = () => { |
99 | getSelectOptions(); | 99 | getSelectOptions(); |
100 | - const { id } = rest; | ||
101 | - scriptId.value = id; | 100 | + // 默认禁用 |
101 | + // const { id } = rest; | ||
102 | + // scriptId.value = id; | ||
102 | }; | 103 | }; |
103 | 104 | ||
104 | const handleChange = (value) => { | 105 | const handleChange = (value) => { |
@@ -106,10 +107,18 @@ | @@ -106,10 +107,18 @@ | ||
106 | emits('change', value); | 107 | emits('change', value); |
107 | }; | 108 | }; |
108 | 109 | ||
109 | - const setValue = (value) => { | ||
110 | - scriptId.value = value; | 110 | + const getValue = () => { |
111 | + return scriptId.value; | ||
112 | + }; | ||
113 | + | ||
114 | + const setValue = async (value) => { | ||
115 | + const scriptOption = await getAllScriptType(props.scriptType); | ||
116 | + if (!scriptOption.map((item) => item.value).includes(value)) { | ||
117 | + scriptId.value = null; | ||
118 | + } else scriptId.value = value; | ||
111 | }; | 119 | }; |
112 | defineExpose({ | 120 | defineExpose({ |
113 | setValue, | 121 | setValue, |
122 | + getValue, | ||
114 | }); | 123 | }); |
115 | </script> | 124 | </script> |
@@ -58,6 +58,8 @@ | @@ -58,6 +58,8 @@ | ||
58 | const scriptSelectItemUpRef = ref<InstanceType<typeof ScriptSelectItem>>(); | 58 | const scriptSelectItemUpRef = ref<InstanceType<typeof ScriptSelectItem>>(); |
59 | 59 | ||
60 | const getFormData = async () => { | 60 | const getFormData = async () => { |
61 | + scriptForm.authScriptId = scriptSelectItemAuthRef.value?.getValue(); | ||
62 | + scriptForm.upScriptId = scriptSelectItemUpRef.value?.getValue(); | ||
61 | //业务 网关子设备没有鉴权脚本 | 63 | //业务 网关子设备没有鉴权脚本 |
62 | if (props.deviceTypeStr === TypeEnum.SENSOR) Reflect.deleteProperty(scriptForm, 'authScriptId'); | 64 | if (props.deviceTypeStr === TypeEnum.SENSOR) Reflect.deleteProperty(scriptForm, 'authScriptId'); |
63 | if (Object.values(scriptForm).some((item) => !item)) { | 65 | if (Object.values(scriptForm).some((item) => !item)) { |