@cloudbase/lowcode-builder 1.2.4 → 1.3.0

package/lib/builder/mp/wxml.js

@@ -11,9 +11,10 @@ const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
 const materials_1 = require("./materials");
 const weapp_1 = require("@cloudbase/lowcode-generator/lib/generator/util/weapp");
 const name_mangler_1 = __importDefault(require("@cloudbase/lowcode-generator/lib/generator/util/name-mangler"));
+const config_1 = require("../config");
+const util_1 = require("./util");
 const error = chalk_1.default.redBright;
-function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, componentGenerics, nodeTransform) {
-    var _a;
+function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, componentGenerics, nodeTransform) {
     const nameMangler = ctx.isProduction ? new name_mangler_1.default({ blackList: mp_1.builtinMpTags }) : undefined;
     const xmlJson = {
         elements: [
@@ -32,12 +33,6 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
     };
     if (ctx.isPage) {
         const originElements = xmlJson.elements;
-        if (originElements === null || originElements === void 0 ? void 0 : originElements.length) {
-            if (!((_a = originElements[0]) === null || _a === void 0 ? void 0 : _a.attributes)) {
-                originElements[0].attributes = {};
-            }
-            originElements[0].attributes['data-weui-theme'] = 'light';
-        }
         // 登录校验: 向其最外层包裹一层block
         xmlJson.elements = [
             {
@@ -45,6 +40,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 name: 'block',
                 attributes: {
                     ['wx:if']: '{{weDaHasLogin}}',
+                    ['data-weui-theme']: 'light',
                 },
                 elements: originElements,
                 _order: -1,
@@ -55,10 +51,11 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
     function createXml(widgets, parent = null, parentForNodes = []) {
         var _a, _b, _c, _d, _e, _f;
         const elements = [];
+        // eslint-disable-next-line no-restricted-syntax
         for (const id in widgets) {
             const { xComponent, xProps, properties, xIndex, genericComp } = widgets[id];
-            const { data: data0 = {}, listeners = [], directives = {}, staticResourceAttribute = ['src'] } = xProps || {};
-            const data = { ...data0 };
+            const { data: _data = {}, listeners = [], directives = {}, staticResourceAttribute = ['src'] } = xProps || {};
+            const data = { ..._data };
             if (directives.waIf && directives.waIf.value === false) {
                 continue;
             }
@@ -66,9 +63,8 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 // slot prop
                 const slotNodes = createXml(properties, parent, parentForNodes);
                 slotNodes.forEach((node) => {
-                    var _a;
                     node.attributes.slot = id;
-                    (_a = parent === null || parent === void 0 ? void 0 : parent.elements) === null || _a === void 0 ? void 0 : _a.push(node);
+                    elements === null || elements === void 0 ? void 0 : elements.push(node);
                 });
                 if (parent) {
                     delete parent.attributes[id];
@@ -77,21 +73,36 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
             }
             const componentKey = `${xComponent.moduleName}:${xComponent.name}`;
             const helpMsg = `Please check component(${id}) in component tree of ${docTag}.`;
-            const materialLib = ctx.materialLibs.find((lib) => lib.name === xComponent.moduleName);
-            const miniprogramPlugin = (_a = ctx.miniprogramPlugins) === null || _a === void 0 ? void 0 : _a.find((plugin) => plugin.name === xComponent.moduleName);
-            if (!materialLib && !miniprogramPlugin) {
-                console.error(error(`Component lib(${xComponent.moduleName}) not found. ${helpMsg}`));
-                continue;
-            }
-            const componentProto = materialLib
-                ? materialLib.components.find((comp) => comp.name === xComponent.name)
-                : miniprogramPlugin === null || miniprogramPlugin === void 0 ? void 0 : miniprogramPlugin.componentConfigs.find((comp) => comp.name === xComponent.name);
-            if (!componentProto) {
-                console.error(error(`Component(${xComponent.name}) not found in lib(${xComponent.moduleName}). ${helpMsg}`));
-                continue;
+            let tagName, path, componentProto;
+            switch (componentKey) {
+                case `${config_1.REPEATER.MODULE_NAME}:${config_1.REPEATER.REPEATER_NAME}`: {
+                    const children = createXml(properties, parent, parentForNodes);
+                    for (let item of children) {
+                        item._order = xIndex || 0;
+                    }
+                    elements.push(...children);
+                    continue;
+                    break;
+                }
+                case `${config_1.REPEATER.MODULE_NAME}:${config_1.REPEATER.REPEATER_ITEM_NAME}`: {
+                    tagName = 'block';
+                    path = '';
+                    break;
+                }
+                default: {
+                    componentProto = (0, util_1.findComponentInfo)(xComponent, {
+                        materialLibs: ctx.materialLibs,
+                        miniprogramPlugins: ctx.miniprogramPlugins,
+                    });
+                    if (!componentProto) {
+                        console.error(error(`Component(${xComponent.name}) not found in lib(${xComponent.moduleName}). ${helpMsg}`));
+                        continue;
+                    }
+                    const meta = (0, materials_1.getWxmlTag)(ctx, xComponent, nameMangler);
+                    tagName = meta.tagName;
+                    path = meta.path;
+                }
             }
-            // eslint-disable-next-line prefer-const
-            let { tagName, path } = (0, materials_1.getWxmlTag)(xComponent, ctx, nameMangler);
             if (genericComp === null || genericComp === void 0 ? void 0 : genericComp.propName) {
                 tagName = getGenericCompTagName(genericComp.propName);
                 componentGenerics[tagName] = { default: path || tagName };
@@ -100,50 +111,46 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 usingComponents[tagName] = path;
             }
             let curForNodes = parentForNodes;
-            if ((_b = directives.waFor) === null || _b === void 0 ? void 0 : _b.value) {
+            if ((_a = directives.waFor) === null || _a === void 0 ? void 0 : _a.value) {
                 curForNodes = [...curForNodes, id];
             }
             const attrPrefix = `${wxmlDataPrefix.widgetProp}${id}${curForNodes
                 .map((forNodeId) => `[${wxmlDataPrefix.forIndex}${forNodeId}]`)
                 .join('')}`;
-            const idAttr = curForNodes.length < 1
-                ? id
-                : `{{'${id}'${curForNodes.map((forNodeId) => `+ '-' + ${wxmlDataPrefix.forIndex}${forNodeId}`).join('')}}}`;
             if (tagName === 'slot') {
                 const slotNode = {
                     type: 'element',
                     name: tagName,
                     attributes: {
-                        name: data0.name.type && data0.name.type !== 'static' ? `{{${id}.name}}` : data0.name.value,
+                        name: data.name.type && data.name.type !== 'static' ? `{{${id}.name}}` : data.name.value,
                     },
                     elements: [],
                     _order: xIndex || 0,
                     _parent: null,
                 };
-                if ((_c = directives.waIf) === null || _c === void 0 ? void 0 : _c.value) {
+                if ((_b = directives.waIf) === null || _b === void 0 ? void 0 : _b.value) {
                     slotNode.attributes['wx:if'] = getAttrBind(directives.waIf, `${attrPrefix}._waIf`);
                 }
                 elements.push(slotNode);
                 continue;
             }
+            const rawTag = ['slot', 'block'].includes(tagName);
             const node = {
                 type: 'element',
                 name: tagName,
                 attributes: {
-                    id: idAttr,
-                    'bind:attached': '__mnt__',
-                    'bind:detached': '__unmnt__',
-                    style: `{{${attrPrefix}.style}}`,
-                    [(0, mp_1.getClassAttrName)(tagName)]: `{{${attrPrefix}.className}}`,
+                    id: curForNodes.length < 1
+                        ? id
+                        : `{{'${id}'${curForNodes
+                            .map((forNodeId) => `+ '-' + ${wxmlDataPrefix.forIndex}${forNodeId}`)
+                            .join('')}}}`,
+                    style: rawTag || ((_c = componentProto === null || componentProto === void 0 ? void 0 : componentProto.meta) === null || _c === void 0 ? void 0 : _c.mustEmptyStyle) ? undefined : `{{${attrPrefix}.style}}`,
+                    [(0, mp_1.getClassAttrName)(tagName)]: rawTag ? undefined : `{{${attrPrefix}.className}}`,
                 },
                 elements: [],
                 _order: xIndex || 0,
                 _parent: parent,
             };
-            const { mustEmptyStyle } = componentProto.meta || {};
-            if (mustEmptyStyle) {
-                delete node.attributes.style;
-            }
             if ((_d = directives.waIf) === null || _d === void 0 ? void 0 : _d.value) {
                 node.attributes['wx:if'] = getAttrBind(directives.waIf, `${attrPrefix}._waIf`);
             }
@@ -154,7 +161,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 node.attributes['wx:for-index'] = wxmlDataPrefix.forIndex + id;
                 node.attributes['wx:key'] = ((_f = directives.waForKey) === null || _f === void 0 ? void 0 : _f.value) ? '_key' : '$$i';
             }
-            const compSchema = componentProto.dataForm;
+            const compSchema = componentProto === null || componentProto === void 0 ? void 0 : componentProto.dataForm;
             for (const prop of Object.keys(data || {})) {
                 if (compSchema) {
                     const fieldDef = compSchema[prop];
@@ -175,7 +182,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                         // handle generic component, https://developers.weixin.qq.com/miniprogram/dev/framework/custom-component/generics.html
                         const passedComp = data[prop].value;
                         const [libName, compName] = passedComp.split(':');
-                        const { tagName, path } = (0, materials_1.getWxmlTag)({ moduleName: libName, name: compName }, ctx, nameMangler);
+                        const { tagName, path } = (0, materials_1.getWxmlTag)(ctx, { moduleName: libName, name: compName }, nameMangler);
                         node.attributes[`generic:${getGenericCompTagName(prop)}`] = tagName;
                         usingComponents[tagName] = path;
                         continue;
@@ -186,28 +193,28 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                     : `${attrPrefix}['${prop}']`;
                 xmlJsonSetCustomAttr(node, prop, getAttrBind(data[prop], widgetBind, staticResourceAttribute.includes(prop)), xComponent);
             }
+            /**
+             * 来自外部引用的组件，添加系统系别的事件绑定
+             */
+            if (componentGenerics[tagName] || usingComponents[tagName]) {
+                node.attributes['bind:attached'] = '__mnt__';
+                node.attributes['bind:detached'] = '__unmnt__';
+            }
             // Event binding
-            const { inputProps, syncProps } = componentProto.meta || {};
+            const { inputProps, syncProps } = (componentProto === null || componentProto === void 0 ? void 0 : componentProto.meta) || {};
             const syncConfigs = syncProps || inputProps || {};
-            Object.entries(syncConfigs).map(([prop, config]) => {
-                const configs = Array.isArray(config) ? config : [config];
-                configs.forEach(({ changeEvent: evtName }) => {
-                    // 兼容微信 7.0.13 安卓版本 textarea 组件的 bindinput 事件，bind:input 写法，事件会失效
-                    const sep = getEventBindSep(tagName);
-                    node.attributes[`bind${sep}${evtName}`] = getMpEventHanlderName(id, evtName);
-                });
-            });
-            listeners.forEach((l) => {
-                const evtName = getMpEventName(l.trigger);
-                const modifiers = l;
-                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] = getMpEventHanlderName(id, evtName, modifiers);
-            });
+            const processedListeners = [...(0, util_1.generateSyncListeners)(syncConfigs), ...listeners];
             // 扩展组件配置
-            const { compConfig } = componentProto;
+            const { compConfig } = componentProto || {};
             // 如果是数据容器，则增加一个onDataChange事件 bind:onDataChange="onid1$onDataChange"
             if (compConfig === null || compConfig === void 0 ? void 0 : compConfig.isDataContainer) {
-                node.attributes['bind:onDataChange'] = getMpEventHanlderName(id, 'onDataChange');
+                processedListeners.push(...(0, util_1.generateDataContainerListeners)());
             }
+            processedListeners.forEach((l) => {
+                const evtName = getMpEventName(l.trigger);
+                const modifiers = l;
+                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] = getMpEventHanlderName(id, evtName, modifiers);
+            });
             if (compConfig === null || compConfig === void 0 ? void 0 : compConfig.pluginConfig) {
                 if (compConfig.pluginConfig.attributes) {
                     Object.assign(node.attributes, compConfig.pluginConfig.attributes);
@@ -233,7 +240,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
             }*/
             node.elements = node.elements.concat(createXml(properties, node, curForNodes));
             // 特殊处理 swiper，对swiper 子节点包裹议程 swiperItem
-            if (tagName === 'swiper' || componentKey === 'weda:Swiper' || componentKey === 'gsd-h5-react:Swiper') {
+            if (tagName === 'swiper' || componentKey === 'weda:Swiper' || componentKey === `${config_1.OFFICIAL_LIB_KEY}:Swiper`) {
                 node.elements = node.elements.map((item, index) => {
                     var _a, _b;
                     let { ['wx:for']: wxFor, ['wx:for-index']: wxForIndex, ['wx:key']: wxKey, ['wx:if']: wxIf, ...itemRestKey } = item.attributes || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.2.4",
+  "version": "1.3.0",
   "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.2",
-    "@cloudbase/lowcode-generator": "^1.2.2",
+    "@cloudbase/cals": "^0.5.6",
+    "@cloudbase/lowcode-generator": "^1.3.0",
     "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.ccc8cf9b70a10613d046.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.d8ce1d946578756cc8da.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app/weapps-api.js

@@ -1,9 +1,10 @@
 import { observable } from 'mobx'
 import { createMpApp } from '@cloudbase/weda-client';
 import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../common/util'
-import process from '<%= subLevelPath %>../common/process'
 import appGlobal from '<%= subLevelPath %>../app/app-global'
 import { createDataset } from '<%= subLevelPath %>../datasources/index'
+import lodashGet from 'lodash.get';
+
 
 <%= importor.state? `import state from '../lowcode/state'` : "const state = {}" %>
 <%= importor.computed? `import computed from '../lowcode/computed'` : "const computed = {}" %>
@@ -12,7 +13,15 @@ import { createDataset } from '<%= subLevelPath %>../datasources/index'
 const mainAppKey = '__weappsMainApp'
 
 export const app = createGlboalApi()
-export { process }
+export const $app = new Proxy({}, { get: function(obj, prop){ return app[prop] }});
+export const $w = new Proxy(
+  {},
+  {
+    get(_, prop) {
+      return app.__internal__.$w?.[prop];
+    },
+  },
+);
 
 function createGlboalApi() {
   const mpApp = createMpApp({

package/template/mp/app.js

@@ -1,5 +1,5 @@
 <%= importor.lifecycle? "import lifeCycle from './lowcode/lifecycle'" : "const lifeCycle = {}" %>
-import { app } from './app/weapps-api'
+import { app, $app } from './app/weapps-api'
 // 引入数据源管理器并进行初始化
 import { setConfig, getAccessToken, EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index'
 import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './common/util'
@@ -15,7 +15,6 @@ console.warn = (...args) => {
     }
 }
 
-const $app = new Proxy({}, { get: function(obj, prop){ return app[prop] }});
 // 设置数据源请求的 loading 及 toast 处理
 setConfig({
   beforeDSRequest: (cfg) => {

package/template/mp/common/constant.js

@@ -0,0 +1 @@
+export const REPEATER = <%= REPEATER %>