@ray-js/api 1.4.0-alpha.1 → 1.4.0-alpha.10

package/lib/panel/devInfo/index.js

@@ -1,13 +1,8 @@
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-import "core-js/modules/es.promise.js";
 import { getDeviceInfo, getLaunchOptionsSync, getGroupInfo, getApp, registerDeviceListListener, registerGroupChange, exitMiniProgram, subscribeDeviceRemoved, onDeviceRemoved } from '@ray-js/api';
 // 本地化缓存 deviceInfo 方便随时调用
-var __deviceInfo = null;
-var defaultPanelEnvironmentOptions = {
+let __deviceInfo = null;
+const defaultPanelEnvironmentOptions = {
   useDefaultOffline: true,
   bleCover: false,
   customTop: null,
@@ -15,17 +10,20 @@ var defaultPanelEnvironmentOptions = {
   showBLEToast: true
 };
 export function parseDevice(dev) {
-  if (!dev) return null; // @ts-ignore
-
-  var deviceInfo = _objectSpread({}, dev);
-
-  var schema = dev.schema;
-  var idCodes = {};
-  var codeIds = {};
-  schema.forEach(function (item) {
+  if (!dev) return null;
+  // @ts-ignore
+  const deviceInfo = _objectSpread({}, dev);
+  const {
+    schema
+  } = dev;
+  const idCodes = {};
+  const codeIds = {};
+  schema.forEach(item => {
     // @ts-ignore
-    var id = item.id,
-        code = item.code;
+    const {
+      id,
+      code
+    } = item;
     idCodes[id] = code;
     codeIds[code] = id;
   });
@@ -33,35 +31,33 @@ export function parseDevice(dev) {
   deviceInfo.codeIds = codeIds;
   return deviceInfo;
 }
+
 /**
  * 初始化面板环境下使用到的设备信息
  * @returns Promise<DevInfo>
  */
-
-export var initDevInfo = function (option) {
-  return new Promise(function (resolve, reject) {
+export const initDevInfo = option => {
+  return new Promise((resolve, reject) => {
     if (__deviceInfo) {
       resolve(__deviceInfo);
     }
-
-    var data = getLaunchOptionsSync();
-
-    var _ref = option || data.query,
-        deviceId = _ref.deviceId,
-        groupId = _ref.groupId;
-
+    const data = getLaunchOptionsSync();
+    const {
+      deviceId,
+      groupId
+    } = option || data.query;
     if (groupId) {
       getGroupInfo({
-        groupId: groupId,
-        success: function success(groupInfo) {
+        groupId,
+        success: groupInfo => {
           __deviceInfo = groupInfo;
           resolve(__deviceInfo);
         }
       });
     } else {
       getDeviceInfo({
-        deviceId: deviceId,
-        success: function success(deviceInfo) {
+        deviceId,
+        success: deviceInfo => {
           __deviceInfo = parseDevice(deviceInfo);
           resolve(__deviceInfo);
         },
@@ -70,108 +66,75 @@ export var initDevInfo = function (option) {
     }
   });
 };
-export var getDevInfo = function () {
+export const getDevInfo = () => {
   return __deviceInfo;
 };
-export var updateDevInfo = function (devInfo) {
+export const updateDevInfo = devInfo => {
   __deviceInfo = devInfo;
 };
+
 /**
  * 监听设备移除
  */
-
-var handleDeviceRemoved = function () {
+const handleDeviceRemoved = () => {
   exitMiniProgram();
 };
+
 /**
  * 绑定当前设备或群组基础事件
  * @param config: InitPanelEnvironmentOptions 配置项
  */
-
-
-export function initPanelEnvironment() {
-  return _initPanelEnvironment.apply(this, arguments);
-}
-
-function _initPanelEnvironment() {
-  _initPanelEnvironment = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var options,
-        App,
-        _args = arguments;
-    return _regeneratorRuntime.wrap(function (_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            options = _args.length > 0 && _args[0] !== undefined ? _args[0] : defaultPanelEnvironmentOptions;
-
-            if (getApp()) {
-              _context.next = 5;
-              break;
-            }
-
-            _context.next = 4;
-            return new Promise(function (resolve) {
-              setTimeout(function () {
-                resolve(initPanelEnvironment(options));
-              }, 0);
-            });
-
-          case 4:
-            return _context.abrupt("return");
-
-          case 5:
-            App = getApp(); // 基础库版本需要大于 2.6.0
-            // @ts-ignore
-
-            App.onReady = function (event) {
-              var _options$deviceId, _options$groupId;
-
-              var deviceId = (_options$deviceId = options.deviceId) !== null && _options$deviceId !== void 0 ? _options$deviceId : event.query.deviceId;
-              var groupId = (_options$groupId = options.groupId) !== null && _options$groupId !== void 0 ? _options$groupId : event.query.groupId;
-              var useDefaultOffline = options.useDefaultOffline; // @ts-ignore
-
-              if (ty.panel && ty.panel.initPanelKit && useDefaultOffline) {
-                // @ts-ignore
-                ty.panel.initPanelKit(_objectSpread({
-                  deviceId: deviceId,
-                  groupId: groupId
-                }, options));
-              } else {
-                // 否则使用 registerDeviceListListener 注册，删除上述条件方法
-                // 若需要能用离线逻辑，则需要在 global.config.ts 中添加   pageWrapper: ['@ray-js/ray-panel-wrapper/lib/page'],
-                if (deviceId) {
-                  registerDeviceListListener({
-                    deviceIdList: [deviceId]
-                  });
-                }
-
-                if (groupId) {
-                  registerGroupChange({
-                    groupIdList: [groupId]
-                  });
-                }
-              }
-
-              if (deviceId) {
-                subscribeDeviceRemoved({
-                  deviceId: deviceId,
-                  success: function success() {
-                    onDeviceRemoved(handleDeviceRemoved);
-                  }
-                });
-              }
-            }; // 使用 Promise 确保业务可以通过 initPanelEnvironment 的正常调用明确设备信息初始化完成
-
-
-            _context.next = 9;
-            return initDevInfo(options.deviceId || options.groupId ? options : undefined);
-
-          case 9:
-          case "end":
-            return _context.stop();
-        }
+export async function initPanelEnvironment() {
+  let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultPanelEnvironmentOptions;
+  if (!getApp()) {
+    await new Promise(resolve => {
+      setTimeout(() => {
+        resolve(initPanelEnvironment(options));
+      }, 0);
+    });
+    return;
+  }
+  const App = getApp();
+
+  // 基础库版本需要大于 2.6.0
+  // @ts-ignore
+  App.onReady = event => {
+    var _options$deviceId, _options$groupId;
+    const deviceId = (_options$deviceId = options.deviceId) !== null && _options$deviceId !== void 0 ? _options$deviceId : event.query.deviceId;
+    const groupId = (_options$groupId = options.groupId) !== null && _options$groupId !== void 0 ? _options$groupId : event.query.groupId;
+    const {
+      useDefaultOffline
+    } = options;
+    // @ts-ignore
+    if (ty.panel && ty.panel.initPanelKit && useDefaultOffline) {
+      // @ts-ignore
+      ty.panel.initPanelKit(_objectSpread({
+        deviceId,
+        groupId
+      }, options));
+    } else {
+      // 否则使用 registerDeviceListListener 注册，删除上述条件方法
+      // 若需要能用离线逻辑，则需要在 global.config.ts 中添加   pageWrapper: ['@ray-js/ray-panel-wrapper/lib/page'],
+      if (deviceId) {
+        registerDeviceListListener({
+          deviceIdList: [deviceId]
+        });
+      }
+      if (groupId) {
+        registerGroupChange({
+          groupIdList: [groupId]
+        });
       }
-    }, _callee);
-  }));
-  return _initPanelEnvironment.apply(this, arguments);
+    }
+    if (deviceId) {
+      subscribeDeviceRemoved({
+        deviceId,
+        success: () => {
+          onDeviceRemoved(handleDeviceRemoved);
+        }
+      });
+    }
+  };
+  // 使用 Promise 确保业务可以通过 initPanelEnvironment 的正常调用明确设备信息初始化完成
+  await initDevInfo(options.deviceId || options.groupId ? options : undefined);
 }

package/lib/panel/i18n/index.d.ts

@@ -1,4 +1,4 @@
-declare type LanguageMap = {
+type LanguageMap = {
     [key: string]: Record<string, string>;
 };
 export default class I18N {