From 1eef968ae60475cca4fbd8a0fde9f3e56abc4980 Mon Sep 17 00:00:00 2001 From: Yingchun Date: Wed, 6 Nov 2024 11:14:43 +0800 Subject: [PATCH] fix: lite card bundle js file for IDE perview Signed-off-by: Yingchun --- packages/hap-dsl-xvm/src/loaders/ux-loader.js | 48 +++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/packages/hap-dsl-xvm/src/loaders/ux-loader.js b/packages/hap-dsl-xvm/src/loaders/ux-loader.js index 5a32e1a5..b4214c3a 100644 --- a/packages/hap-dsl-xvm/src/loaders/ux-loader.js +++ b/packages/hap-dsl-xvm/src/loaders/ux-loader.js @@ -53,45 +53,53 @@ function assemble($loader, frags, name, uxType, lite) { } // prettier-ignore - let content = - `${importFrag}\n` + - `var $app_style$ = ${processStyleFrag($loader, frags.style, uxType, lite)}\n` + let content = `${importFrag}\n` + if (!lite) { + // process script for JS card + content += `var $app_script$ = ${processScriptFrag($loader, frags.script, uxType)}\n` + } + content += + `$app_define$('@app-component/${name}', [], function($app_require$, $app_exports$, $app_module$) {\n` + + `${moduleExports}\n` + + ` $app_module$.exports.template = ${processTemplateFrag( + $loader, + frags.template, + uxType, + importNames, + lite + )}\n` + // $app_define$ function content + if (frags.style.length > 0) { + content += ` $app_module$.exports.style = ${processStyleFrag( + $loader, + frags.style, + uxType, + lite + )}\n` + } if (lite) { // process for lite card - content += `$app_module$.exports.uidata = ${processDataFrag( + content += ` $app_module$.exports.uidata = ${processDataFrag( $loader, frags.data, uxType, FRAG_TYPE.DATA )}\n` - content += `$app_module$.exports.actions = ${processActionFrag( + content += ` $app_module$.exports.actions = ${processActionFrag( $loader, frags.data, uxType, FRAG_TYPE.ACTIONS )}\n` - content += `$app_module$.exports.props = ${processPropsFrag( + content += ` $app_module$.exports.props = ${processPropsFrag( $loader, frags.data, uxType, FRAG_TYPE.PROPS )}\n` - content += `$app_data$($app_module$, $app_require$)\n` - } else { - // process script for normal card - content += `var $app_script$ = ${processScriptFrag($loader, frags.script, uxType)}\n` + content += ` $app_data$($app_module$, $app_require$)\n` } content += - `$app_define$('@app-component/${name}', [], function($app_require$, $app_exports$, $app_module$) {\n` + - `${moduleExports}\n` + - ` $app_module$.exports.template = ${processTemplateFrag( - $loader, - frags.template, - uxType, - importNames, - lite - )}\n` + - `${frags.style.length > 0 ? ' $app_module$.exports.style = $app_style$;' : ''}\n` + `});\n` + `${ isUXRender(uxType)