@cloudbase/lowcode-builder 1.3.15-private.0 → 1.3.15-private.2

package/lib/builder/mp/materials.js

@@ -146,9 +146,7 @@ async function installMaterials(ctx, projDir, usedComps, weapps) {
             comp.materialName = lib.name;
         });
     });
-    // Collection infomation from components to lib meta
-    const compositedLibs = materialLibs.filter((lib) => lib.isComposite && usedComps[lib.name]);
-    compositedLibs.map((lib) => {
+    materialLibs.map((lib) => {
         lib.dependencies = lib.dependencies || {};
         lib.components.map((cmp) => {
             cmp.meta.syncProps = {};
@@ -159,14 +157,18 @@ async function installMaterials(ctx, projDir, usedComps, weapps) {
                     cmp.meta.syncProps[prop] = syncProp || inputProp;
                 }
             }
-            cmp.meta.platforms = {
-                mp: {
-                    path: `${cmp.name}/index`,
-                },
-            };
-            lib.dependencies = { ...lib.dependencies, ...cmp.npmDependencies };
+            if (lib.isComposite) {
+                cmp.meta.platforms = {
+                    mp: {
+                        path: `${cmp.name}/index`,
+                    },
+                };
+                lib.dependencies = { ...lib.dependencies, ...cmp.npmDependencies };
+            }
         });
     });
+    // Collection infomation from components to lib meta
+    const compositedLibs = materialLibs.filter((lib) => lib.isComposite && usedComps[lib.name]);
     // #2 Generate composited libs
     await Promise.all(compositedLibs.map(async (lib) => {
         console.log(`Generate composited library ${lib.name}`);

package/lib/builder/mp/util.js

@@ -220,7 +220,7 @@ function getListenersHandlers(listeners, id, componentApi) {
         return {};
     const eventHandlers = {};
     listeners.forEach((l) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e;
         const handlerName = (0, wxml_1.getMpEventHanlderName)(id, l.trigger, l);
         eventHandlers[handlerName] = eventHandlers[handlerName] || [];
         const params = generatedDynamicData(l.data);
@@ -243,6 +243,7 @@ function getListenersHandlers(listeners, id, componentApi) {
             key: l.key || '',
             handler,
             handlerModule: (_c = l.handler) === null || _c === void 0 ? void 0 : _c.moduleName,
+            sourceKey: `${((_d = l.handler) === null || _d === void 0 ? void 0 : _d.moduleName) || ''}:${((_e = l.handler) === null || _e === void 0 ? void 0 : _e.name) || ''}`,
             data: params.staticProps,
             boundData: params.boundProps,
             type: l.type,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.3.15-private.0",
+  "version": "1.3.15-private.2",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,8 +38,8 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.5.11",
-    "@cloudbase/lowcode-generator": "1.3.7-private.0",
+    "@cloudbase/cals": "^0.5.12",
+    "@cloudbase/lowcode-generator": "1.3.7-private.1",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -475,7 +475,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.dd7f29a986538b6b1dce.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.90a1845eb61a012b3d66.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app.wxss

@@ -5,7 +5,7 @@ page {
   box-sizing: border-box;
 }
 
-page view, page element, page text, page image {
+page, page view, page element, page text, page image {
   box-sizing: border-box;
 }
 

package/template/mp/common/util.js

@@ -70,7 +70,6 @@ export function createEventHandlers(
       const { lists = [], forItems = {} } = forContext;
       const dataContext = untracked(() => generateDataContext(currentTarget));
       const $w = untracked(() => generateWidgetAPIContext(owner?.__internal__?.$w, currentTarget, forContext));
-
       listeners.forEach(async (l) => {
         let { data = {}, boundData = {} } = l;
         data = { ...data };
@@ -79,11 +78,11 @@ export function createEventHandlers(
             set(data, k, boundData[k].call(owner, owner, lists, forItems, event, dataContext, $w));
           }
           let res = await l.handler.call(owner, { event, data });
-          let eventName = prefix && l.key ? `${prefix}$${l.key}_success` : '';
+          let eventName = prefix && l.key ? `${prefix}$${l.key}${(l.sourceKey !== 'platform:utils.If') ? '_success' : (res ? '_success' : '_fail')}` : '';
           self[eventName] &&
             self[eventName]({
               ...event,
-              detail: res,
+              detail: l.sourceKey === 'platform:utils.If' ? event.detail : res,
             });
         } catch (e) {
           let eventName = l.key ? `${prefix}$${l.key}_fail` : '';

package/template/mp/common/widget.js

@@ -729,6 +729,10 @@ class UserWidget {
         // return target._widget[prop];
         return undefined;
       },
+      /**
+       * userwidget 不可写
+       */
+      set() {},
     });
   }
 

package/template/mp/component/index.js

@@ -18,6 +18,7 @@ const evtListeners = {<% Object.entries(eventHandlers).map(([handlerName, listen
   <%= handlerName%>: [
     <%listeners.map(l=> { %>{
       key: '<%= l.key %>',
+      sourceKey: '<%= l.sourceKey %>',
       handler: <% if (l.type == 'rematch') {%> _handler<%= l.handler %> <%} else {%> <%= l.handler %> <%} %>,
       data: <%= stringifyObj(l.data, {depth: null}) %>,
       boundData: {<% Object.entries(l.boundData).map(([prop, bindMeta])=>{%>'<%= prop %>':($comp, lists, forItems, event, $context, $w) => {<%= bindMeta.imports %> return (

package/template/mp/page/index.js

@@ -14,6 +14,7 @@ const evtListeners = {<% Object.entries(eventHanlders).map(([handlerName, listen
   <%= handlerName%>: [
     <%listeners.map(l=> { %>{
       key: '<%= l.key %>',
+      sourceKey: '<%= l.sourceKey %>',
       handler: <% if (l.type === 'rematch') {%> handlers.<%= l.handler %> <%} else if (l.type == 'material') {%> function(...args) { return require('../../materials/<%= l.handlerModule %>/actions/<%= l.handler %>/index').default(...args) } <%} else {%> <%= l.handler %> <%} %>,
       data: <%= stringifyObj(l.data, {depth: null}) %>,
       boundData: {<% Object.entries(l.boundData).map(([prop, bindMeta])=>{%>'<%= prop %>':($page, lists, forItems, event, $context, $w) => {<%= bindMeta.imports %> return (