Commit 21b6cebe9118a732f5a4cf34d05966ddb52a710d

Authored by xp.Huang
2 parents c1fa2b37 bb02a01a

Merge branch 'cherry-pick-83244c9f' into 'main'

fix: 修复规则引擎脚本管理tbel选择直连和网关没展示对数据

See merge request yunteng/thingskit-front!1406
@@ -200,58 +200,62 @@ export const formSchemas: FormSchema[] = [ @@ -200,58 +200,62 @@ export const formSchemas: FormSchema[] = [
200 valueField: 'value', 200 valueField: 'value',
201 renderComponentContent: ({ model }) => { 201 renderComponentContent: ({ model }) => {
202 return { 202 return {
203 - beforeFormat: ({ scriptLanguage }) => [  
204 - h(Tooltip, { title: '脚本用例' }, () =>  
205 - h(  
206 - Dropdown,  
207 - {  
208 - trigger: ['click'],  
209 - dropMenuList: [  
210 - {  
211 - text: '直连/子设备用例',  
212 - event: 'directWithSensor',  
213 - onClick: () => {  
214 - const { JavaScript, TBEL } = getDirectWithSensorScript();  
215 - model[FormFieldsEnum.ScriptContent] = {  
216 - scriptLanguage,  
217 - value: scriptLanguage === ScriptLanguageEnum.JavaScript ? JavaScript : TBEL,  
218 - }; 203 + beforeFormat: ({ scriptLanguage }) => {
  204 + return [
  205 + h(Tooltip, { title: '脚本用例' }, () =>
  206 + h(
  207 + Dropdown,
  208 + {
  209 + trigger: ['click'],
  210 + dropMenuList: [
  211 + {
  212 + text: '直连/子设备用例',
  213 + event: 'directWithSensor',
  214 + onClick: () => {
  215 + const { JavaScript, TBEL } = getDirectWithSensorScript();
  216 + model[FormFieldsEnum.TbelContent] = {
  217 + scriptLanguage,
  218 + value:
  219 + scriptLanguage === ScriptLanguageEnum.JavaScript ? JavaScript : TBEL,
  220 + };
  221 + },
219 }, 222 },
220 - },  
221 - {  
222 - text: '网关用例',  
223 - event: 'gateway',  
224 - onClick: () => {  
225 - const { JavaScript, TBEL } = getGatewayScript();  
226 - model[FormFieldsEnum.ScriptContent] = {  
227 - scriptLanguage,  
228 - value: scriptLanguage === ScriptLanguageEnum.JavaScript ? JavaScript : TBEL,  
229 - }; 223 + {
  224 + text: '网关用例',
  225 + event: 'gateway',
  226 + onClick: () => {
  227 + const { JavaScript, TBEL } = getGatewayScript();
  228 + model[FormFieldsEnum.TbelContent] = {
  229 + scriptLanguage,
  230 + value:
  231 + scriptLanguage === ScriptLanguageEnum.JavaScript ? JavaScript : TBEL,
  232 + };
  233 + },
230 }, 234 },
231 - },  
232 - ],  
233 - },  
234 - () =>  
235 - h(  
236 - Tag,  
237 - { color: '#2a79ef', class: 'cursor-pointer' },  
238 - {  
239 - icon: () =>  
240 - h(Icon, {  
241 - icon: 'magic',  
242 - prefix: 'mdi',  
243 - size: 14,  
244 - class: 'cursor-pointer svg:text-sm',  
245 - }),  
246 - default: () => '脚本用例',  
247 - }  
248 - )  
249 - )  
250 - ),  
251 - h(Tooltip, { title: '复制' }, () =>  
252 - h(Icon, { icon: 'copy-filled', prefix: 'ant-design', class: 'cursor-pointer' })  
253 - ),  
254 - ], 235 + ],
  236 + },
  237 + () =>
  238 + h(
  239 + Tag,
  240 + { color: '#2a79ef', class: 'cursor-pointer' },
  241 + {
  242 + icon: () =>
  243 + h(Icon, {
  244 + icon: 'magic',
  245 + prefix: 'mdi',
  246 + size: 14,
  247 + class: 'cursor-pointer svg:text-sm',
  248 + }),
  249 + default: () => '脚本用例',
  250 + }
  251 + )
  252 + )
  253 + ),
  254 + h(Tooltip, { title: '复制' }, () =>
  255 + h(Icon, { icon: 'copy-filled', prefix: 'ant-design', class: 'cursor-pointer' })
  256 + ),
  257 + ];
  258 + },
255 }; 259 };
256 }, 260 },
257 }, 261 },