@cloudbase/lowcode-builder 1.8.9 → 1.8.11

package/template/mp/common/{query.ts → query.js}

@@ -1,59 +1,20 @@
-import { observable, IReactionDisposer, autorun, toJS } from 'mobx';
+import { observable, autorun, toJS } from 'mobx';
 import { createEventHandlers, getMpEventHandlerName, mergeDynamic2StaticData } from './util';
 import { Event } from './event-emitter';
 
-interface IMPDataSourceQuery {
-  id: string;
-  label?: string;
-  description?: string;
-  trigger: 'auto' | 'manual';
-  type: 'model' | 'apis' | 'sql';
-  dataSourceName: string;
-  methodName: string;
-  data: object;
-  dataBinds: Record<string, Function>;
-  /**
-   * 预处理后 event handler listeners
-   */
-  eventHandlers?: Record<string, any>;
-}
-interface IQueryContext {
-  $w: any,
-  $app?: any,
-  $page?: any
-};
-type IDataBind = any;
-interface IGenerateOptions {
-  looseError: boolean
-};
-
 export class Query {
-  private _schema: IMPDataSourceQuery;
-  private _context: IQueryContext;
-  private _disposes: IReactionDisposer[] = [];
-  private _dataBinds: Record<string, IDataBind> = {};
-  private _triggered = false;
-  private _action: any;
-  private _paramsRef: { current: any } = observable({ current: null });
-  private _currentRequestKey: any = null;
-  private _observableValue: { data: any; error: Error | null } = observable({ data: null, error: null });
-  private _eventHandlerMap: Record<string, Function> = {};
-  private _timer: any;
-
-  constructor({
-    schema,
-    context,
-    options = {},
-  }: {
-    schema: IMPDataSourceQuery;
-    context: IQueryContext;
-    options?: IGenerateOptions;
-  }) {
+  constructor({ schema, context, options = {} }) {
+    this._disposes = [];
+    this._dataBinds = {};
+    this._triggered = false;
+    this._paramsRef = observable({ current: null });
+    this._currentRequestKey = null;
+    this._observableValue = observable({ data: null, error: null });
+    this._eventHandlerMap = {};
     const { looseError = false } = options;
     const { $w } = context;
     this._schema = schema;
     this._context = context;
-
     if (this._schema?.trigger === 'auto') {
       this._disposes.push(
         autorun(
@@ -71,38 +32,29 @@ export class Query {
         ),
       );
     }
-
-    const baseParam: {
-      dataSourceName: string;
-      sqlTemplateId?: string;
-      methodName?: string;
-    } = {
+    const baseParam = {
       dataSourceName: this._schema.dataSourceName,
     };
-
     if (this._schema?.type === 'sql') {
       baseParam.sqlTemplateId = this._schema.methodName;
     } else {
       baseParam.methodName = this._schema.methodName;
     }
-
     this._paramsRef.current = this._schema.data;
     this._dataBinds = this._schema.dataBinds;
-
     this._action = async (data) => {
       return $w.cloud.callDataSource({
         ...baseParam,
         params: data,
       });
     };
-
     this._eventHandlerMap = Object.entries(
       createEventHandlers(this._schema.eventHandlers || {}, {
         looseError: looseError,
         isComposite: false,
       }),
     ).reduce(
-      (map, [key, fn]: [string, any]) => {
+      (map, [key, fn]) => {
         // map[key] = fn.bind(this);
         map[key] = fn;
         return map;
@@ -111,7 +63,6 @@ export class Query {
         _getInstance: () => this._context.$page || this._context.$app,
       },
     );
-
     // this._emit = async (trigger, eventData, originalEvent?) =>
     //   generateEmit($w)(
     //     trigger,
@@ -131,41 +82,32 @@ export class Query {
     //     $w.page.id,
     //     true,
     //   );
-
     return this;
   }
-
-  get id(): string {
+  get id() {
     return this._schema?.id || '';
   }
-
-  get label(): string {
+  get label() {
     return this._schema?.label || '';
   }
-
-  get description(): string {
+  get description() {
     return this._schema?.description || '';
   }
-
   get data() {
     return this._observableValue.data;
   }
-
   get error() {
     return this._observableValue.error;
   }
-
-  async trigger(additionalScope?, options = {}) {
+  async trigger(additionalScope, options = {}) {
     this._triggered = true;
     return this._innerTrigger(this._resolveParams(), additionalScope, options);
   }
-
   reset() {
     this._observableValue.data = null;
     this._observableValue.error = null;
   }
-
-  async _innerTrigger(data, additionalScope?, options = {}) {
+  async _innerTrigger(data, additionalScope, options = {}) {
     this._currentRequestKey = Date.now();
     const key = this._currentRequestKey;
     try {
@@ -179,14 +121,13 @@ export class Query {
     } catch (e) {
       if (key === this._currentRequestKey) {
         this._observableValue.data = null;
-        this._observableValue.error = e as any;
+        this._observableValue.error = e;
         this._emit(`fail`, e);
       }
       throw e;
     }
   }
-
-  private _debounceTrigger(...args) {
+  _debounceTrigger(...args) {
     if (this._timer) {
       clearTimeout(this._timer);
     }
@@ -194,12 +135,10 @@ export class Query {
       this._innerTrigger(...args);
     }, 300);
   }
-
   destroy() {
     this._disposes.forEach((dispose) => dispose());
   }
-
-  private _resolveParams() {
+  _resolveParams() {
     /**
      * 这里万一其中某个字段计算失败
      * 好像会阻塞其他字段的计算
@@ -216,8 +155,7 @@ export class Query {
       // may be additional scope
     })?.params;
   }
-
-  private async _emit(eventName: string, data?: any) {
+  async _emit(eventName, data) {
     return this._eventHandlerMap[getMpEventHandlerName(this.id, eventName)]?.(
       new Event({
         type: eventName,
@@ -228,10 +166,8 @@ export class Query {
     );
   }
 }
-
-export function generateDatasetQuery(schema, context: IQueryContext, options: IGenerateOptions) {
+export function generateDatasetQuery(schema, context, options) {
   const result = {};
-
   for (const key in schema) {
     result[key] = new Query({ schema: schema[key], context, options });
   }

package/template/mp/common/util.js

@@ -6,7 +6,6 @@ import { getAccessToken, loginScope } from '../datasources/index';
 import { app } from '../app/weapps-api';
 export { generateDatasetQuery } from './query';
 export { generateEventFlows } from './flow';
-import { Event } from './event-emitter';
 
 /**
  * Convert abcWordSnd -> abc-word-snd
@@ -157,6 +156,9 @@ export function createEventHandlers(
             }
           }
         } catch (e) {
+          if (e.message) {
+            e.message = `${currentTarget?.id || ''}[${trigger}:${l.key}]: ${e.message}`;
+          }
           nextEventHandles[0].handlerName = l.key ? `${prefix}$${l.key}_fail` : '';
           nextEventHandles[0].event.detail = isIfAction ? event.detail : e;
           error = e;
@@ -170,12 +172,20 @@ export function createEventHandlers(
           const nextHandler = nextEventHandles[0];
 
           if (!self[nextHandler.handlerName] && error) {
-            console.error(`Action error: [${trigger}:${l.key}]`, error);
+            console.error(`Action error:`, error);
             if (!looseError) {
-              app.showToast({
-                icon: 'error',
-                title: `事件响应失败`,
-              });
+              if (app.__internal__?.env?.type !== 'production') {
+                app.showModal({
+                  title: `事件响应失败`,
+                  content: error.message || '',
+                  showCancel: false,
+                });
+              } else {
+                app.showToast({
+                  icon: 'error',
+                  title: `事件响应失败`,
+                });
+              }
             }
             throw error;
           } else {
@@ -213,7 +223,6 @@ export function createEventHandlers(
           return res.length ? res[0] : event.detail;
         });
       }
-
     };
   }
 
@@ -456,7 +465,6 @@ export function formatErrorMsg(e) {
  * 检查页面权限
  **/
 export async function checkAuth(app, appId, $page) {
-  return true;
   const loginPage = findLoginPage(app);
   if (loginPage?.id === $page.id) {
     return true;
@@ -521,7 +529,7 @@ export function redirectToLogin(currentPage) {
       pageId: loginPage.id,
       params: {
         sourcePageId: currentPage.id,
-        sourcePageParams: currentPage.params,
+        sourcePageParams: currentPage.params || currentPage.dataset?.params,
       },
     });
   } else {

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

@@ -86,7 +86,11 @@ export function createPage({
 
   return Component({
     _componentType: 'page',
-    data: createInitData(widgetProps, dataBinds),
+    data: {
+      ...createInitData(widgetProps, dataBinds),
+      _isCheckingAtuh: false,
+      weDaHasLogin: false
+    },
     lifetimes: {
       attached() {
         this._disposers = []
@@ -108,7 +112,7 @@ export function createPage({
           const widget = getWidget($page.widgets, e.target.id);
           widget._methods = {};
         };
-        this._disposers.push( ...this.initMergeRenderer($page.widgets));
+        this._disposers.push(...this.initMergeRenderer($page.widgets));
       },
       detached() {
         const $page = this._getInstance();
@@ -142,18 +146,25 @@ export function createPage({
             if (query) {
               EXTRA_API.setParams($page.uuid, query);
             }
-            if (await checkAuth(app, app.id, $page)) {
-              this.setData({
-                weDaHasLogin: true,
-              });
-              createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page }));
+            try {
+              this.setData({ _isCheckingAtuh: true })
+              const auth = await checkAuth(app, app.id, $page);
+              if(auth) {
+                this.setData({
+                  weDaHasLogin: true,
+                });
+                createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page }));
+              }
+            } finally {
+              this.setData({ _isCheckingAtuh: false })
             }
+
             // eslint-disable-next-line no-restricted-syntax
-            for (const queryId in $page.dataset?.query||{}) {
+            for (const queryId in $page.dataset?.query || {}) {
               if ($page.dataset.query[queryId]?._schema?.trigger === 'auto') {
                 try {
                   $page.dataset.query[queryId].trigger();
-                  this._disposers.push(()=> $page.dataset.query[queryId].destroy())
+                  this._disposers.push(() => $page.dataset.query[queryId].destroy())
                 } catch (e) {
                   console.error(`query ${queryId} 初始化失败：`, e);
                 }