@cloudbase/lowcode-builder 0.1.16 → 0.1.19

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "0.1.16",
+  "version": "0.1.19",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "@cloudbase/cals": "^0.3.29",
-    "@cloudbase/lowcode-generator": "^0.6.22",
+    "@cloudbase/lowcode-generator": "^0.6.26",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",
@@ -84,4 +84,4 @@
     "webpack-dev-server": "^4.7.3",
     "worker-loader": "^3.0.8"
   }
-}
+}

package/template/mp/app.js

@@ -1,8 +1,7 @@
-import { setConfig, getAccessToken, initTcb } from './datasources/index'
 import lifeCycle from './lowcode/lifecycle'
 import { app } from './app/weapps-api'
 // 引入数据源管理器并进行初始化
-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'
 
 const $app = app;

package/template/mp/common/util.js

@@ -220,20 +220,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();
@@ -367,295 +353,3 @@ 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);
-export const utils = {
-  formatDate,
-  get: getter,
-  set: setter,
-};

package/template/mp/package.json

@@ -3,8 +3,8 @@
 	"version": "1.0.8",
 	"scripts": {},
 	"dependencies": {
-		"@cloudbase/weda-client": "^0.2.2",
-    "@cloudbase/oauth": "0.1.1-alpha.2",
+		"@cloudbase/weda-client": "^0.2.4",
+    "@cloudbase/oauth": "0.1.1-alpha.5",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",
 		"lodash.set": "^4.3.2",

package/template/package.json

@@ -9,7 +9,7 @@
     "@tcwd/weapps-core": "2.2.6",
     "@tcwd/weapps-sdk": "1.2.9",
     "@zxing/library": "^0.18.6",
-    "@cloudbase/weda-client": "^0.2.2",
+    "@cloudbase/weda-client": "^0.2.4",
     "fastclick": "^1.0.6",
     "lodash": "^4.17.19",
     "mobx": "^5.15.4",

package/template/src/app/global-api.js

@@ -3,12 +3,10 @@ import { createComputed } from 'utils';
 import store, { subPackageName } from '../store';
 import computed from '../store/computed';
 import common from './common';
-import { formatDate } from '../utils/date';
-import { getter, setter, _isMobile } from '../utils';
+import { _isMobile } from '../utils';
 import actionMap from './material-actions';
-import { scanCodeApi } from '../utils/scan-code-action';
 import { createWebApp, _ACTIONS_KEY as ACTIONS_KEY, _ROUTER_KEY as ROUTER_KEY } from '@cloudbase/weda-client';
-import { createDataset, EXTRA_API } from '../datasources/index'
+import { createDataset, EXTRA_API } from '../datasources/index';
 
 const mainAppKey = '__weappsMainApp';
 const appGlobal = process.env.isMiniprogram ? getApp() : window;
@@ -35,7 +33,7 @@ function createGlboalApi() {
     state: store,
     computed: createComputed(computed.global),
     common,
-    ...mpApp
+    ...mpApp,
     // ... other sdk apis & apis from mp
   }; // The global api exposed to lowcode
 
@@ -44,11 +42,7 @@ function createGlboalApi() {
   globalAPI.state.dataset = dataset;
   globalAPI.setState = (userSetState) => {
     Object.keys(userSetState).forEach((keyPath) => {
-      globalAPI.utils.set(
-        globalAPI.dataset.state,
-        keyPath,
-        userSetState[keyPath]
-      );
+      globalAPI.utils.set(globalAPI.dataset.state, keyPath, userSetState[keyPath]);
     });
   };
   /**

package/template/src/utils/index.js

@@ -10,20 +10,6 @@ export function createComputed(funcs, bindContext = null) {
   return obj;
 }
 
-/*
-根据 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 checkVisible({ _visible }) {
   return _visible !== false && _visible !== '';
 }
@@ -69,10 +55,10 @@ export function _isMobile() {
   (function (a) {
     if (
       /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(
-        a
+        a,
       ) ||
       /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(
-        a.substr(0, 4)
+        a.substr(0, 4),
       )
     )
       check = true;