@cloudbase/framework-plugin-low-code 0.7.10-beta.3 → 0.7.10

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

@@ -1,9 +1,10 @@
 import { observable } from 'mobx'
-import { createComputed, formatDate, getter, setter, formatEnum, enumOptions} from '<%= subLevelPath %>../common/util'
+import { createMpApp } from '@cloudbase/weda-client';
+import { createComputed, formatEnum, enumOptions} from '<%= subLevelPath %>../common/util'
 import process from '<%= subLevelPath %>../common/process'
-import { DS_SDK, CLOUD_SDK, createDataset, EXTRA_API } from '<%= subLevelPath %>../datasources/index'
 import appGlobal from '<%= subLevelPath %>../app/app-global'
-import weappApis from '<%= subLevelPath %>../common/weapp-sdk'
+import { CLOUD_SDK, createDataset, EXTRA_API } from '<%= subLevelPath %>../datasources/index'
+
 
 <% if (!isBare) {%>
 import state from '../lowcode/state'
@@ -21,78 +22,47 @@ export const app = createGlboalApi()
 export { process }
 
 function createGlboalApi() {
+  const mpApp = createMpApp({
+    appConfig: <%= appConfig %>
+  })
   const globalAPI = {
     id: '<%= appId %>',
     domain: '<%= domain %>',
     platform: 'MINIPROGRAME',
-    __internal__: {
-      activePage: null,
-      getConfig: function () {
-        return <%= appConfig %>;
-      },
-      resolveStaticResourceUrl(staticUrl) {
-        if (/^\//.test(staticUrl)) {
-          const domain = globalAPI?.__internal__?.getConfig?.()?.staticResourceDomain || globalAPI?.domain || ''
-          const url = `https://${domain}${staticUrl}`;
-          return url;
-        }
-        return staticUrl;
-      }
-    },
-    dataSources: DS_SDK,
     pages: {},
     session: {
       //configure: sdk.configure,
       //request: sdk.request,
       //getSessionId: sdk.getSessionId,
     },
-    enumOptions: enumOptions,
     state: observable(state),
     computed: createComputed(computed),
     common,
-    relaunchHome: function () {
-      let wx_pages = getCurrentPages();
-      const { pages = [] } = globalAPI.__internal__.getConfig();
-      if (
-        wx_pages[0]?.route?.match(/pages\/(.*)\/index/)?.[1] === pages[0]?.id
-      ) {
-        globalAPI.navigateBack({ delta: 10 });
-      } else if (pages[0]?.id) {
-        globalAPI.reLaunch({
-          pageId: pages[0].id,
-        });
-      }
-    },
     invoke(params) {
       return app.__internal__.activePage.invokeComponentMethod(params)
     },
-    utils: {
-      formatDate,
-      formatEnum,
-      get: getter,
-      set: setter,
-      /**
-       * @deprecated
-       */
-      _getConfig(){
-        return globalAPI.__internal__.getConfig()
-      },
-      async getWXContext() {
-        const { Data } = await globalAPI.cloud.callWedaApi({
-          action: 'InvokeComponentWxModule',
-          data: {
-            Method: 'GetWxContext',
-          },
-        });
-        return typeof Data === 'string' ? JSON.parse(Data) : Data
-      },
-      getCurrentPage: function(){
-        return globalAPI.__internal__.activePage
-      }
-    },
-    // ... other sdk apis & apis from mp
+    ...mpApp,
   } // The global api exposed to lowcode
 
+
+  globalAPI.__internal__.enumOptions = enumOptions
+  globalAPI.utils.formatEnum = formatEnum
+  /**
+   * @deprecated utils._getConfig
+   */
+  globalAPI.utils._getConfig = () => {
+    return globalAPI.__internal__.getConfig()
+  }
+  globalAPI.utils.getWXContext = async function() {
+    const { Data } = await globalAPI.cloud.callWedaApi({
+      action: 'InvokeComponentWxModule',
+      data: {
+        Method: 'GetWxContext',
+      },
+    });
+    return typeof Data === 'string' ? JSON.parse(Data) : Data
+  }
+
   let dataset = createDataset('$global')
   globalAPI.dataset = dataset
   globalAPI.state.dataset = dataset
@@ -101,18 +71,6 @@ function createGlboalApi() {
       globalAPI.utils.set(globalAPI.dataset.state, keyPath, userSetState[keyPath]);
     });
   };
-   /**
-   * 内部通用的设置状态变量值的方法
-   *  varPath 结构为 $global.<变量名> 即全局变量
-   *                $page.<变量名>  即当前页面变量
-   *                <pageId>.<变量名> 指定页面 pageId 的变量 (应当避免修改非当前页面的变量值)
-   */
-  globalAPI._setStateVal = (config) => {
-    // @ts-ignore
-    EXTRA_API.setState(config.varPath, config.val);
-  };
-  // mount wx apis
-  Object.assign(globalAPI, weappApis)
 
   const subPackageName = '<%= subPackageName %>'
   if (subPackageName) {
@@ -127,31 +85,5 @@ function createGlboalApi() {
   // 避免被wx.cloud 覆盖
   globalAPI.cloud = CLOUD_SDK
 
-  // # expose some sdk modules
-  /* const sdkModsIncluded = ['flow', 'getPageOptions', 'getLaunchOptions']
-  sdkModsIncluded.forEach(key => {
-    globalAPI[key] = sdk[key]
-  }) */
-  const { scanCode } = globalAPI
-  globalAPI.scanCode = (options) => {
-    const {enableDefaultBehavior, ...restOptions} = options;
-    const shouldReturnPromise = (!restOptions.success && !restOptions.complete && !restOptions.fail);
-    if(shouldReturnPromise) {
-      return new Promise((resolve, reject) => {
-        scanCode(restOptions).then((res) => {
-          if(enableDefaultBehavior) {
-            globalAPI.showModal({
-              title: '扫描到以下内容',
-              content: res.result,
-              showCancel: false,
-            })
-          }
-          resolve(res)
-        })
-        .catch(reject)
-      })
-    }
-    return scanCode(restOptions);
-  }
   return globalAPI
 }

package/template/mp/app.js

@@ -1,94 +1,78 @@
-import { setConfig, getAccessToken, initTcb } from '@cloudbase/weda-cloud-sdk'
 import lifeCycle from './lowcode/lifecycle'
 import { app } from './app/weapps-api'
-import WxReportV2 from './common/wx_yypt_report_v2'
 // 引入数据源管理器并进行初始化
-import { EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index';
+import { setConfig, getAccessToken, EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index';
 import { redirectToLogin, findLoginPage, getAuthConfig } from './common/util'
 
-<% if (yyptConfig.yyptAppKey) { %>
-const wxReport = new WxReportV2({
-  appKey: '<%= yyptConfig.yyptAppKey %>', // 填入你申请的运营平台的应用key(必填)
-  reportUrl: '<%= yyptConfig.reportUrl %><%= yyptConfig.yyptAppKey %>', // 上报url（把后端上报接口需要先挂网关，该url填写网关地址）
-  autoReportPV: true, // 是否自动上报页面PV
-  // getRemoteParamsUrl获取远程参数url，主要用于获取intervalTime、reportLogsNum和stopReport参数，
-  // 返回格式{stopReport:true,intervalTime:3,reportLogsNum:5}
-  getRemoteParamsUrl: '',
-  stopReport: <%= yyptConfig.stopReport %>, // 停止上报
-  intervalTime: 3, // 间隔多久执行一次上报，默认3秒
-  reportLogsNum: 5, // 每次合并上报记录条数，默认5次
-});
-<% }%>
-
-  // 设置数据源请求的 loading 及 toast 处理
-  setConfig({
-    beforeDSRequest: (cfg) => {
-      if (!cfg.options || !cfg.options.showLoading) return
-      app.showLoading()
-    },
-    beforeCallFunction: async (params) => {
-      try {
-        const loginPage = findLoginPage();
+// 设置数据源请求的 loading 及 toast 处理
+setConfig({
+  beforeDSRequest: (cfg) => {
+    if (!cfg.options || !cfg.options.showLoading) return
+    app.showLoading()
+  },
+  beforeCallFunction: async (params) => {
+    try {
+      const loginPage = findLoginPage();
 
-        let skip = false;
-        switch (params?.data?.methodName) {
-          case 'callWedaApi': {
-            if (['GetMiniProgramUserTicket', 'DescribeRuntimeResourceStrategy'].includes(params?.data?.params.action)) {
-              skip = true;
-            }
-            break;
+      let skip = false;
+      switch (params?.data?.methodName) {
+        case 'callWedaApi': {
+          if (['GetMiniProgramUserTicket', 'DescribeRuntimeResourceStrategy'].includes(params?.data?.params.action)) {
+            skip = true;
           }
+          break;
         }
+      }
 
-        // 后续做过滤处理
-        if (!loginPage || (params?.data?.mode === 'c' && skip)) {
-          return params;
-        }
-        // await initTcb();
-        const { accessToken } = await getAccessToken();
-        if (accessToken) {
-          params.data.accessToken = accessToken;
-        }
-      } catch (e) {
-        if (app?.cloud?.currentUser?.userType === "externalUser" && e?.error === 'unauthenticated') {
+      // 后续做过滤处理
+      if (!loginPage || (params?.data?.mode === 'c' && skip)) {
+        return params;
+      }
+      // await initTcb();
+      const { accessToken } = await getAccessToken();
+      if (accessToken) {
+        params.data.accessToken = accessToken;
+      }
+    } catch (e) {
+      if (app?.cloud?.currentUser?.userType === "externalUser" && e?.error === 'unauthenticated') {
+        app.showToast({
+          title: '登录态失效',
+          icon: 'error',
+        });
+      }
+      console.error('beforeCallFunction error', e);
+    }
+    return params;
+  },
+  afterDSRequest: (cfg, error, result) => {
+    if (!cfg.options) return
+    if (cfg.options.showLoading) app.hideLoading()
+    if (!cfg.options.showToast) return
+    const isSuccess = !error && result && !result.code
+    app.showToast({ icon: isSuccess ? 'success' : 'error' })
+  },
+  async afterCallFunction(params, error, res) {
+    if (params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code)) {
+      const loginPage = findLoginPage();
+      if (loginPage) {
+        const authConfig = await getAuthConfig();
+        let isAnonymous = true;
+        try {
+          const { accessToken } = await getAccessToken();
+          isAnonymous = !accessToken;
+        } catch (e) { }
+        if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
+          redirectToLogin();
+        } else if (authConfig.RejectStrategy == 'show_warning') {
           app.showToast({
-            title: '登录态失效',
+            title: '接口无访问权限',
             icon: 'error',
           });
         }
-        console.error('beforeCallFunction error', e);
-      }
-      return params;
-    },
-    afterDSRequest: (cfg, error, result) => {
-      if (!cfg.options) return
-      if (cfg.options.showLoading) app.hideLoading()
-      if (!cfg.options.showToast) return
-      const isSuccess = !error && result && !result.code
-      app.showToast({ icon: isSuccess ? 'success' : 'error' })
-    },
-    async afterCallFunction(params, error, res) {
-      if (params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code)) {
-        const loginPage = findLoginPage();
-        if (loginPage) {
-          const authConfig = await getAuthConfig();
-          let isAnonymous = true;
-          try {
-            const { accessToken } = await getAccessToken();
-            isAnonymous = !accessToken;
-          } catch (e) { }
-          if (isAnonymous && authConfig.RejectStrategy == 'to_login') {
-            redirectToLogin();
-          } else if (authConfig.RejectStrategy == 'show_warning') {
-            app.showToast({
-              title: '接口无访问权限',
-              icon: 'error',
-            });
-          }
-        }
       }
     }
-  })
+  }
+})
 
 App({
   onLaunch(options) {

package/template/mp/common/util.js

@@ -1,11 +1,9 @@
 'use strict';
 
 import { findForItemsOfWidget, mpCompToWidget } from './widget'
-import lodashGet from 'lodash.get';
-import lodashSet from 'lodash.set';
 import { observable } from 'mobx';
 import { app } from '../app/weapps-api'
-import { getAccessToken } from '@cloudbase/weda-cloud-sdk'
+import { auth } from '@cloudbase/weda-client'
 
 /**
  * Convert abcWordSnd -> abc-word-snd
@@ -219,20 +217,6 @@ export function set(object, path, value) {
   return object
 }
 
-/*
-根据 object对象的path路径获取值。 如果解析 value 是 undefined 会以 defaultValue 取代。
-*/
-export function getter(context, path, defaultValue = undefined) {
-  return lodashGet(context, path, defaultValue);
-}
-
-/*
-设置 object对象中对应 path 属性路径上的值，如果path不存在，则创建。 缺少的索引属性会创建为数组，而缺少的属性会创建为对象。 使用_.setWith 定制path创建
-*/
-export function setter(context, path, value = undefined) {
-  return lodashSet(context, path, value);
-}
-
 export function findLoginPage() {
   const { app } = getApp();
   const { pages = [] } = app.__internal__.getConfig();
@@ -314,7 +298,7 @@ export async function checkAuth(app, appId, $page) {
 
   let isAnonymousUser = true;
   try {
-    const { accessToken } = await getAccessToken();
+    const { accessToken } = await auth.getAccessToken();
     isAnonymousUser = !accessToken;
   } catch (e) { }
 
@@ -367,293 +351,6 @@ export function redirectToLogin(currentPage) {
   }
 }
 
-// 日期转换
-class CustomDate {
-  constructor() {
-    this.i18n = {
-      dayNames: [
-        'Sun',
-        'Mon',
-        'Tue',
-        'Wed',
-        'Thu',
-        'Fri',
-        'Sat',
-        'Sunday',
-        'Monday',
-        'Tuesday',
-        'Wednesday',
-        'Thursday',
-        'Friday',
-        'Saturday',
-      ],
-      monthNames: [
-        'Jan',
-        'Feb',
-        'Mar',
-        'Apr',
-        'May',
-        'Jun',
-        'Jul',
-        'Aug',
-        'Sep',
-        'Oct',
-        'Nov',
-        'Dec',
-        'January',
-        'February',
-        'March',
-        'April',
-        'May',
-        'June',
-        'July',
-        'August',
-        'September',
-        'October',
-        'November',
-        'December',
-      ],
-      timeNames: ['a', 'p', 'am', 'pm', 'A', 'P', 'AM', 'PM'],
-    };
-    this.masks = {
-      default: 'ddd mmm dd yyyy HH:MM:ss',
-      shortDate: 'm/d/yy',
-      paddedShortDate: 'mm/dd/yyyy',
-      mediumDate: 'mmm d, yyyy',
-      longDate: 'mmmm d, yyyy',
-      fullDate: 'dddd, mmmm d, yyyy',
-      shortTime: 'h:MM TT',
-      mediumTime: 'h:MM:ss TT',
-      longTime: 'h:MM:ss TT Z',
-      isoDate: 'yyyy-mm-dd',
-      isoTime: 'HH:MM:ss',
-      isoDateTime: 'yyyy-mm-dd\'T\'HH:MM:sso',
-      isoUtcDateTime: 'UTC:yyyy-mm-dd\'T\'HH:MM:ss\'Z\'',
-      expiresHeaderFormat: 'ddd, dd mmm yyyy HH:MM:ss Z',
-    };
-    this.token = /d{1,4}|D{3,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|W{1,2}|[LlopSZN]|"[^"]*"|'[^']*'/g;
-    this.timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g;
-    this.timezoneClip = /[^-+\dA-Z]/g;
-  }
-
-  /*
-  *
- | Name              | Mask                           | Example                  |
- | ----------------- | ------------------------------ | ------------------------ |
- | `default`         | `ddd mmm dd yyyy HH:MM:ss`     | Sat Jun 09 2007 17:46:21 |
- | `shortDate`       | `m/d/yy`                       | 6/9/07                   |
- | `paddedShortDate` | `mm/dd/yyyy`                   | 06/09/2007               |
- | `mediumDate`      | `mmm d, yyyy`                  | Jun 9, 2007              |
- | `longDate`        | `mmmm d, yyyy`                 | June 9, 2007             |
- | `fullDate`        | `dddd, mmmm d, yyyy`           | Saturday, June 9, 2007   |
- | `shortTime`       | `h:MM TT`                      | 5:46 PM                  |
- | `mediumTime`      | `h:MM:ss TT`                   | 5:46:21 PM               |
- | `longTime`        | `h:MM:ss TT Z`                 | 5:46:21 PM EST           |
- | `isoDate`         | `yyyy-mm-dd`                   | 2007-06-09               |
- | `isoTime`         | `HH:MM:ss`                     | 17:46:21                 |
- | `isoDateTime`     | `yyyy-mm-dd'T'HH:MM:sso`       | 2007-06-09T17:46:21+0700 |
- | `isoUtcDateTime`  | `UTC:yyyy-mm-dd'T'HH:MM:ss'Z'` | 2007-06-09T22:46:21Z     |
- *
- */
-  format(date, mask, utc, gmt) {
-    let newMask = mask;
-    let newDate = date;
-    let newUtc = utc;
-    let newGmt = gmt;
-    if (arguments.length === 1 && this._kindOf(newDate) === 'string' && !/\d/.test(newDate))
-      newDate = undefined;
-    newDate = newDate || newDate === 0 ? newDate : new Date();
-    if (!(newDate instanceof Date))
-      newDate = new Date(newDate);
-    if (isNaN(newDate))
-      throw TypeError('Invalid date');
-    newMask = String(this.masks[newMask] || newMask || this.masks['default']);
-    const maskSlice = newMask.slice(0, 4);
-    if (maskSlice === 'UTC:' || maskSlice === 'GMT:') {
-      newMask = newMask.slice(4);
-      newUtc = true;
-      if (maskSlice === 'GMT:')
-        newGmt = true;
-    }
-    const _ = newUtc ? 'getUTC' : 'get';
-    const _d = newDate[`${_}Date`]();
-    const D = newDate[`${_}Day`]();
-    const _m = newDate[`${_}Month`]();
-    const y = newDate[`${_}FullYear`]();
-    const _H = newDate[`${_}Hours`]();
-    const _M = newDate[`${_}Minutes`]();
-    const _s = newDate[`${_}Seconds`]();
-    const _L = newDate[`${_}Milliseconds`]();
-    const _o = newUtc ? 0 : newDate.getTimezoneOffset();
-    const _W = this._getWeek(newDate);
-    const _N = this._getDayOfWeek(newDate);
-    // eslint-disable-next-line @typescript-eslint/no-this-alias
-    const self = this;
-    // @ts-ignore
-    // @ts-ignore
-    const flags = {
-      d: () => _d,
-      dd: () => self._pad(_d),
-      ddd: () => self.i18n.dayNames[D],
-      DDD: () => self._getDayName({ y, m: _m, d: _d, _, dayName: self.i18n.dayNames[D], short: true }),
-      dddd: () => self.i18n.dayNames[D + 7],
-      DDDD: () => self._getDayName({ y: y, m: _m, d: _d, _: _, dayName: self.i18n.dayNames[D + 7] }),
-      m: () => _m + 1,
-      mm: () => self._pad(_m + 1),
-      mmm: () => self.i18n.monthNames[_m],
-      mmmm: () => self.i18n.monthNames[_m + 12],
-      yy: () => String(y)
-        .slice(2),
-      yyyy: () => self._pad(y, 4),
-      h: () => _H % 12 || 12,
-      hh: () => self._pad(_H % 12 || 12),
-      H: () => _H,
-      HH: () => self._pad(_H),
-      M: () => _M,
-      MM: () => self._pad(_M),
-      s: () => _s,
-      ss: () => self._pad(_s),
-      l: () => self._pad(_L, 3),
-      L: () => self._pad(Math.floor(_L / 10)),
-      t: () => (_H < 12 ? self.i18n.timeNames[0] : self.i18n.timeNames[1]),
-      tt: () => (_H < 12 ? self.i18n.timeNames[2] : self.i18n.timeNames[3]),
-      T: () => (_H < 12 ? self.i18n.timeNames[4] : self.i18n.timeNames[5]),
-      TT: () => (_H < 12 ? self.i18n.timeNames[6] : self.i18n.timeNames[7]),
-      // eslint-disable-next-line no-nested-ternary
-      Z: () => newGmt ? 'GMT' : newUtc ? 'UTC' : (String(newDate)
-        .match(self.timezone) || ['']).pop()
-        .replace(self.timezoneClip, '')
-        .replace(/GMT\+0000/g, 'UTC'),
-      o: () => (_o > 0 ? '-' : '+') + self._pad(Math.floor(Math.abs(_o) / 60) * 100 + (Math.abs(_o) % 60), 4),
-      p: () => `${(_o > 0 ? '-' : '+') + self._pad(Math.floor(Math.abs(_o) / 60), 2)}:${self._pad(Math.floor(Math.abs(_o) % 60), 2)}`,
-      // @ts-ignore
-      S: () => ['th', 'st', 'nd', 'rd'][_d % 10 > 3 ? 0 : (((_d % 100) - (_d % 10) != 10) * _d) % 10],
-      W: () => _W,
-      WW: () => self._pad(_W),
-      N: () => _N,
-    };
-    return mask.replace(this.token, (match) => {
-      if (match in flags) {
-        return flags[match]();
-      }
-      return match.slice(1, match.length - 1);
-    });
-  }
-
-  _pad(val, len) {
-    let newVal = String(val);
-    const newLen = len || 2;
-    while (newVal.length < newLen) {
-      newVal = `0${newVal}`;
-    }
-    return newVal;
-  }
-
-  _getDayName(_ref) {
-    const { y, m, d, _, dayName } = _ref;
-    const _ref$short = _ref['short'];
-    const _short = _ref$short === void 0 ? false : _ref$short;
-    const today = new Date();
-    const yesterday = new Date();
-    yesterday.setDate(yesterday[`${_}Date`]() - 1);
-    const tomorrow = new Date();
-    tomorrow.setDate(tomorrow[`${_}Date`]() + 1);
-    const today_d = function today_d() {
-      return today[`${_}Date`]();
-    };
-    const today_m = function today_m() {
-      return today[`${_}Month`]();
-    };
-    const today_y = function today_y() {
-      return today[`${_}FullYear`]();
-    };
-    const yesterday_d = function yesterday_d() {
-      return yesterday[`${_}Date`]();
-    };
-    const yesterday_m = function yesterday_m() {
-      return yesterday[`${_}Month`]();
-    };
-    const yesterday_y = function yesterday_y() {
-      return yesterday[`${_}FullYear`]();
-    };
-    const tomorrow_d = function tomorrow_d() {
-      return tomorrow[`${_}Date`]();
-    };
-    const tomorrow_m = function tomorrow_m() {
-      return tomorrow[`${_}Month`]();
-    };
-    const tomorrow_y = function tomorrow_y() {
-      return tomorrow[`${_}FullYear`]();
-    };
-    if (today_y() === y && today_m() === m && today_d() === d) {
-      return _short ? 'Tdy' : 'Today';
-    }
-    if (yesterday_y() === y && yesterday_m() === m && yesterday_d() === d) {
-      return _short ? 'Ysd' : 'Yesterday';
-    }
-    if (tomorrow_y() === y && tomorrow_m() === m && tomorrow_d() === d) {
-      return _short ? 'Tmw' : 'Tomorrow';
-    }
-    return dayName;
-  }
-
-  _getWeek(date) {
-    const targetThursday = new Date(date.getFullYear(), date.getMonth(), date.getDate());
-    targetThursday.setDate(targetThursday.getDate() - ((targetThursday.getDay() + 6) % 7) + 3);
-    const firstThursday = new Date(targetThursday.getFullYear(), 0, 4);
-    firstThursday.setDate(firstThursday.getDate() - ((firstThursday.getDay() + 6) % 7) + 3);
-    const ds = targetThursday.getTimezoneOffset() - firstThursday.getTimezoneOffset();
-    targetThursday.setHours(targetThursday.getHours() - ds);
-    const weekDiff = (targetThursday - firstThursday) / (864e5 * 7);
-    return 1 + Math.floor(weekDiff);
-  }
-
-  _getDayOfWeek(date) {
-    let dow = date.getDay();
-    if (dow === 0) {
-      dow = 7;
-    }
-    return dow;
-  }
-
-  _kindOf(val) {
-    if (val === null) {
-      return 'null';
-    }
-    if (val === undefined) {
-      return 'undefined';
-    }
-    if (this._typeof(val) !== 'object') {
-      return this._typeof(val);
-    }
-    if (Array.isArray(val)) {
-      return 'array';
-    }
-    return {}.toString
-      .call(val)
-      .slice(8, -1)
-      .toLowerCase();
-  }
-
-  _typeof(obj) {
-    if (typeof Symbol === 'function' && typeof Symbol.iterator === 'symbol') {
-      this._typeof = function _typeof(obj) {
-        return typeof obj;
-      };
-    } else {
-      this._typeof = function _typeof(obj) {
-        return obj && typeof Symbol === 'function' && obj.constructor === Symbol && obj !== Symbol.prototype
-          ? 'symbol'
-          : typeof obj;
-      };
-    }
-    return this._typeof(obj);
-  }
-}
-
-const dataInstance = new CustomDate();
-export const formatDate = new CustomDate().format.bind(dataInstance);
-
 let loading = {};
 export let enumOptions = observable({});
 export function formatEnum(path, optionname) {
@@ -685,7 +382,7 @@ function getEnumOptions(optionName) {
   }
   return '';
 }
-export async function getGeneralOptions(optionName) {
+async function getGeneralOptions(optionName) {
   return app.cloud.callWedaApi({
     action: 'DescribeGeneralOptionsDetailList',
     data: {
@@ -696,9 +393,3 @@ export async function getGeneralOptions(optionName) {
   });
 }
 
-export const utils = {
-  formatDate,
-  get: getter,
-  set: setter,
-  formatEnum
-};