@cloudbase/framework-plugin-low-code 0.6.23 → 0.6.26

package/lib/builder/service/builder/generate.js

@@ -608,7 +608,7 @@ function generateRouterFile(allAppDataList, appBuildDir, basename = '', buildTyp
             weapps_core_1.loopDealWithFn(pageInstanceList, (pageInstance) => {
                 const pageId = [rootPath, pageInstance.id].filter((i) => i).join('_');
                 if (pageInstance.isHome && !rootPath) {
-                    routerRenders.push(`<Redirect from="/" exact to="/${pageId}"/>`);
+                    routerRenders.push(`<Route from="/" exact children={() => <Redirect to="/${pageId}" />} />`);
                 }
                 routerImports.push(`import Page${pageId} from '${pageFilePath}pages/${pageInstance.id}/index';`);
                 routerRenders.push(`<Route path="/${pageId}" component={Page${pageId}}/>`);

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/index.js

@@ -591,7 +591,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
                         const { deployOptions, appId } = this._resolvedInputs;
                         const isPreview = (deployOptions === null || deployOptions === void 0 ? void 0 : deployOptions.mode) === types_1.DEPLOY_MODE.PREVIEW;
                         const link = common_2.buildAsAdminPortalByBuildType(this._resolvedInputs.buildTypeList)
-                            ? `https://${this._website.cdnDomain}/adminportal/#/app/${isPreview ? `${appId}-preview` : appId}?envType=${isPreview ? 'preivew' : 'prod'}`
+                            ? `https://${this._website.cdnDomain}/adminportal/#/app/${isPreview ? `${appId}-preview` : appId}?envType=${isPreview ? 'preview' : 'prod'}`
                             : this._gatewayConfig
                                 ? `https://${this._gatewayConfig.Domain + this._gatewayConfig.Path}`
                                 : `https://${this._website.cdnDomain +
@@ -976,22 +976,20 @@ class LowCodePlugin extends framework_core_1.Plugin {
                     domainConfig: { FollowRedirect: 'on' },
                 }));
                 yield Promise.all(modifyDomainConfigPromises);
-                if (this._gatewayConfig) {
-                    yield this.api.cloudbaseManager
-                        .commonService('lowcode', '2021-01-08')
-                        .call({
+                yield Promise.all([
+                    this.api.cloudbaseManager.commonService('lowcode', '2021-01-08').call({
                         Action: 'PublishAppCustomUrl',
                         Param: {
                             EnvId: this.api.envId,
                             WeAppId: this._resolvedInputs.appId,
                             IndexPath: this._getWebRootPath(),
                         },
-                    });
-                }
-                yield hostingService.setWebsiteDocument({
-                    indexDocument: 'index.html',
-                    routingRules: this._rules,
-                });
+                    }),
+                    hostingService.setWebsiteDocument({
+                        indexDocument: 'index.html',
+                        routingRules: this._rules,
+                    }),
+                ]);
             }
             catch (e) {
                 this.api.logger.error('网站路由注册失败: ', e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.6.23",
+  "version": "0.6.26",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/mp/common/util.js

@@ -28,7 +28,7 @@ export function createComputed(funcs, bindContext = null) {
   return computed
 }
 
-export function createEventHandlers(evtListeners) {
+export function createEventHandlers(evtListeners, context) {
   const evtHandlers = {}
   for (const name in evtListeners) {
     const listeners = evtListeners[name]
@@ -41,7 +41,7 @@ export function createEventHandlers(evtListeners) {
         let { data = {}, boundData = {} } = l
         data = { ...data }
         for (const k in boundData) {
-          set(data, k, boundData[k](lists, itemsById, event))
+          set(data, k, boundData[k](lists, itemsById, event, context))
         }
         try {
           let res = await l.handler.call(self, { event, lists, forItems: itemsById, data })

package/template/mp/common/weapp-component.js

@@ -97,7 +97,7 @@ export function createComponent(key, behaviors, properties, events, handler, dat
     },
 
     methods: {
-      ...createEventHandlers(evtListeners),
+      ...createEventHandlers(evtListeners, context),
       ...mergeRenderer,
       getWeAppInst() {
         const $comp = this.$WEAPPS_COMP

package/template/mp/common/weapp-page.js

@@ -25,7 +25,7 @@ export function createPage(
       app.utils.set($page.dataset.state, keyPath, userSetState[keyPath]);
     });
   };
-  const evtHandlers = createEventHandlers(evtListeners);
+  const evtHandlers = createEventHandlers(evtListeners, context);
 
   function extractLifecyles() {
     const result = { ...lifecycle };

package/template/mp/common/widget.js

@@ -71,7 +71,7 @@ function createSubWidgetTree(curForNode, widgetProps, dataBinds, ownerMpInst, wi
       } else {
         disposeWidget(existedWidget, true)
       }
-      setUpWidateDataBinds(w, dataBinds[node.id], forItems, failedBinds)
+      setUpWidateDataBinds(w, dataBinds[node.id], forItems, failedBinds, context)
       widgetHolder[node.id] = w
     } else if (!existedWidget) {
       const len = parentForWidgetArr.push(observable([]))
@@ -188,7 +188,7 @@ function createAWidget(props, id, parent, ownerMpInst) {
   return w
 }
 
-function setUpWidateDataBinds(w, dataBinds, forItems, failedBinds) {
+function setUpWidateDataBinds(w, dataBinds, forItems, failedBinds, context) {
   Object.keys(dataBinds || {}).map(prop => {
     if (prop === '_waFor') { return }
     const setUpDataBind = () => {
@@ -196,7 +196,7 @@ function setUpWidateDataBinds(w, dataBinds, forItems, failedBinds) {
       const dispose = autorun(() => {
         try {
           // Computed data bind in the next tick since data bind may read widgets data
-          w[prop] = dataBinds[prop](forItems.lists, forItems.itemsById)
+          w[prop] = dataBinds[prop](forItems.lists, forItems.itemsById, undefined, context)
         } catch (e) {
           if(prop === '_waIf'){
             w[prop] = false

package/template/src/handlers/FieldMiddleware/renderer.jsx

@@ -64,14 +64,25 @@ export const CompRenderer = observer(function (props) {
   // 组件最终用于执行的事件函数
   const emit = useCallback(
     (trigger, event, forItems, scopeContext) => {
+      const listeners = listenerInstances || [];
+
       // 如果是数据容器，则将传过来的data，赋值给容器上下文context
       if (
-        trigger === 'onDataChange' &&
-        componentSchema?.compConfig?.isDataContainer
+        componentSchema?.compConfig?.isDataContainer &&
+        !listeners?.some((listener) => listener.trigger === 'onDataChange')
       ) {
-        updateContext(compId, event?.data);
+        listeners?.push({
+          key: `wa${Date.now().toString().slice(-8)}`,
+          trigger: 'onDataChange',
+          isCapturePhase: false,
+          data: {},
+          dataBinds: {},
+          instanceFunction: ({ event }) => {
+            return updateContext(compId, event?.detail?.data);
+          },
+        });
       }
-      const listeners = listenerInstances;
+
       event = { detail: event, name: trigger };
       forItems = {
         ...forItems,
@@ -85,7 +96,8 @@ export const CompRenderer = observer(function (props) {
           customEventData: event,
           forItems,
         },
-        scopeContext
+        scopeContext,
+        context
       );
     },
     [props]
@@ -113,7 +125,8 @@ export const CompRenderer = observer(function (props) {
           customEventData: event,
           forItems,
         },
-        scopeContext
+        scopeContext,
+        context
       );
     },
     [props]

package/template/src/handlers/actionHandler/utils.js

@@ -11,7 +11,7 @@ export function getMetaInfoBySourceKey(sourceKey) {
   };
 }
 
-export function emitEvent(trigger, listeners = [], args, scopeContext = {}) {
+export function emitEvent(trigger, listeners = [], args, scopeContext = {}, context) {
   const targetListeners = listeners.filter((l) => l.trigger === trigger);
   targetListeners.forEach(async (listener) => {
     // 当前非捕获Event，再判断冒泡行为
@@ -28,7 +28,7 @@ export function emitEvent(trigger, listeners = [], args, scopeContext = {}) {
       (args?.customEventData?.detail?.isCapturePhase || false)
     ) {
       try {
-        const res = await invokeListener(listener, args, scopeContext);
+        const res = await invokeListener(listener, args, scopeContext, context);
         const eventName = `${listener.key}.success`;
         const event = {
           detail: {
@@ -46,7 +46,8 @@ export function emitEvent(trigger, listeners = [], args, scopeContext = {}) {
             event,
             customEventData: event,
           },
-          scopeContext
+          scopeContext,
+          context
         );
       } catch (e) {
         const eventName = `${listener.key}.fail`;
@@ -66,7 +67,8 @@ export function emitEvent(trigger, listeners = [], args, scopeContext = {}) {
             event,
             customEventData: event,
           },
-          scopeContext
+          scopeContext,
+          context
         );
         // 之前 invoke 内部catch 了错误，不会抛错
         // throw e
@@ -78,7 +80,8 @@ export function emitEvent(trigger, listeners = [], args, scopeContext = {}) {
 async function invokeListener(
   { instanceFunction, data = {}, dataBinds = {} },
   args,
-  scopeContext
+  scopeContext,
+  context
 ) {
   // ToDo resolve databinds
   const action = instanceFunction;
@@ -93,7 +96,8 @@ async function invokeListener(
     args.forItems,
     { event: args.event },
     scopeContext,
-    true
+    true,
+    context
   );
 
   // eslint-disable-next-line no-restricted-syntax

package/template/src/handlers/utils/common.js

@@ -23,7 +23,8 @@ export function resolveDataBinds(
   forItems,
   codeContext,
   scopeContext,
-  throwError
+  throwError,
+  context
 ) {
   const resolvedProps = {};
   for (const prop in dataBinds) {
@@ -35,7 +36,7 @@ export function resolveDataBinds(
       resolvedProps[prop] = fn(
         forItems,
         codeContext && codeContext.event,
-        scopeContext
+        context
       );
     } catch (e) {
       console.error('Error resolving data binding', prop, dataBinds[prop], e);

package/template/src/handlers/utils/widgets.js

@@ -119,7 +119,7 @@ export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context
   ) {
     const nodeId = curForNode.id;
     if (!curForNode.value) {
-      return createSubTree(curForNode, {}, scopeContext);
+      return createSubTree(curForNode, {}, scopeContext, context);
     }
     const dispose = autorun(() => {
       let forList = [];
@@ -149,7 +149,7 @@ export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context
 
         forList.forEach((item, index) => {
           const subForItems = { ...forItems, [nodeId]: item };
-          createSubTree(curForNode, subForItems, scopeContext);
+          createSubTree(curForNode, subForItems, scopeContext, context);
         });
 
         // 非初始化时遇到需要重新构建 dataBinds
@@ -159,7 +159,7 @@ export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context
 
     return dispose;
 
-    function createSubTree(curForNode, subForItems, scopeContext) {
+    function createSubTree(curForNode, subForItems, scopeContext, context) {
       const widgets = {};
 
       // traverse down the tree to set all widgets
@@ -212,7 +212,8 @@ export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context
                   w[prop] = dataBinds[node.id][prop](
                     subForItems,
                     undefined,
-                    scopeContext
+                    context,
+                    scopeContext,
                   );
                   disposeError = false;
                 } catch (e) {
@@ -250,7 +251,7 @@ export function createWidgets(widgetProps, dataBinds, scopeContext = {}, context
             widgets,
             node.parent && widgets[node.parent.id],
             scopeContext,
-            context
+            context,
           );
           curForNode.id && widgets[curForNode.id]._disposers.push(dispose);
         }

package/template/src/router/index.tpl

@@ -12,7 +12,7 @@ export default () => {
       <Router history={process.env.isAdminPortal? generateHashHistory({basename: "<%= basename %>"}) : history }>
         <Switch>
          <%= routerRenders %>
-         {process.env.isAdminPortal && <Route children={() => <Redirect to={'/404'} />} />}
+         {process.env.isAdminPortal && false && <Route children={() => <Redirect to={'/404'} />} />}
         </Switch>
       </Router>
     )

package/template/webpack/web.prod.js

@@ -27,6 +27,7 @@ module.exports = function (options) {
     definePlugin = {},
   } = options;
   const isDevelopment = mode !== 'production';
+
   const babelLoader = {
     loader: 'babel-loader',
     options: {
@@ -64,24 +65,49 @@ module.exports = function (options) {
       ].filter(Boolean),
     },
   };
+  const typescriptLoader = {
+    loader: 'ts-loader',
+    options: {
+      compilerOptions: {
+        target: 'ESNext',
+        module: 'ESNext',
+        esModuleInterop: true,
+      },
+      happyPackMode: true,
+      transpileOnly: true,
+    },
+  };
+
   let plugins = [
     new HappyPack({
-      id: TS_LOADER_ID,
+      id: 'vue',
+      cache: true,
+      verbose: true,
       loaders: [
         babelLoader,
+        typescriptLoader,
         {
-          loader: 'ts-loader',
+          loader: 'vue-loader',
           options: {
-            compilerOptions: {
-              target: 'ESNext',
-              module: 'ESNext',
-              esModuleInterop: true,
-            },
-            happyPackMode: true,
-            transpileOnly: true,
-          },
+            threadMode: true,
+            loaders: {
+              js: [babelLoader],
+              ts: [
+                babelLoader,
+                typescriptLoader,
+              ],
+            }
+          }
         },
       ],
+      threadPool: happyThreadPool
+    }),
+    new HappyPack({
+      id: TS_LOADER_ID,
+      loaders: [
+        babelLoader,
+        typescriptLoader,
+      ],
       threadPool: happyThreadPool,
     }),
     new HappyPack({
@@ -156,6 +182,10 @@ module.exports = function (options) {
     },
     module: {
       rules: [
+        {
+          test: /\.vue$/,
+          loader: 'happypack/loader?id=vue'
+        },
         {
           test: /\.tsx?$/,
           exclude: /node_modules\/(?!@cloudbase\/weda-ui)|gsd-kbone-react/,
@@ -163,7 +193,7 @@ module.exports = function (options) {
         },
         {
           test: /\.(js|jsx)$/,
-          exclude: /node_modules\/(?!@cloudbase\/weda-ui)|gsd-kbone-react/,
+          exclude: /node_modules\/(?!(@cloudbase\/weda-ui)|(@tcwd\/vuera))|gsd-kbone-react/,
           use: ['happypack/loader?id=babel'],
         },
         {