@titaui/pc 1.10.47 → 1.10.50

package/lib/components/superset-charts/{init/insert-assets.js → fetch-assets-and-append/append-assets.js}

@@ -11,7 +11,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-var generateScript = function generateScript(assets) {
+var appendJs = function appendJs(assets) {
   return new Promise(function (resolve, reject) {
     var script = document.createElement("script");
     var r = false;
@@ -37,65 +37,70 @@ var generateScript = function generateScript(assets) {
   });
 };
 
-var generateStyle = function generateStyle(assets) {
+var appendCss = function appendCss(assets) {
   var el = document.createElement("link");
   el.href = assets.uri;
   return el;
 };
 
-var InsertAssetsList = /*#__PURE__*/function () {
-  function InsertAssetsList() {
+var AppendAssetsList = /*#__PURE__*/function () {
+  function AppendAssetsList() {
     var _this = this;
 
-    _classCallCheck(this, InsertAssetsList);
-
-    this.generateAssets = function (assets) {
-      var _this$strategy$type, _this$strategy;
+    _classCallCheck(this, AppendAssetsList);
 
+    this.appendAssets = function (assets) {
       var type = assets.type;
-      return (_this$strategy$type = (_this$strategy = _this.strategy)[type]) === null || _this$strategy$type === void 0 ? void 0 : _this$strategy$type.call(_this$strategy, assets);
+      return _this.strategy[type](assets);
     };
 
-    this.insertAssetsList = function () {
+    this.appendAssetsList = function () {
       if (!_this.assetsList.length) return undefined;
 
       if (!_this.init) {
         _this.init = true;
         var fragment = document.createDocumentFragment();
 
-        _this.assetsList.filter(function (element) {
-          return element.type === "css";
-        }).forEach(function (element) {
-          var el = generateStyle(element);
+        _this.assetsList.filter(function (assets) {
+          return assets.type !== "js";
+        }).forEach(function (assets) {
+          if (!assets.type || !_this.strategy[assets.type]) {
+            // eslint-disable-next-line no-console
+            console.error("assets type is not expected");
+            return;
+          }
+
+          var el = _this.appendAssets(assets);
+
           fragment.appendChild(el);
         });
 
-        return Promise.all(_this.assetsList.filter(function (element) {
-          return element.type === "js";
-        }).map(function (element) {
-          return generateScript(element);
+        return Promise.all(_this.assetsList.filter(function (assets) {
+          return assets.type === "js";
+        }).map(function (assets) {
+          return appendJs(assets);
         }));
       }
 
-      return Promise.resolve(1);
+      return Promise.resolve();
     };
 
     this.init = false;
     this.strategy = {
-      js: generateScript,
-      css: generateStyle
+      js: appendJs,
+      css: appendCss
     };
   }
 
-  _createClass(InsertAssetsList, [{
+  _createClass(AppendAssetsList, [{
     key: "setAssets",
     value: function setAssets(assets) {
       this.assetsList = assets;
     }
   }]);
 
-  return InsertAssetsList;
+  return AppendAssetsList;
 }();
 
-var _default = InsertAssetsList;
+var _default = AppendAssetsList;
 exports["default"] = _default;

package/lib/components/superset-charts/{init/use-get-assets.js → fetch-assets-and-append/get-assets-with-cache.js}

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transMetasToTableData = exports.getAssetsVersion = exports.getAssetsUri = exports.getAssets = exports.domain = void 0;
+exports.transMetasToTableData = exports.fetchAssetsVersion = exports.fetchAssetsUri = exports.domain = exports["default"] = void 0;
 
 var _axios = _interopRequireDefault(require("../utils/axios"));
 
@@ -34,7 +34,7 @@ var transMetasToTableData = function transMetasToTableData() {
 exports.transMetasToTableData = transMetasToTableData;
 var storageKey = "DEMO_CHART_URI_";
 
-var getAssetsVersion = function getAssetsVersion() {
+var fetchAssetsVersion = function fetchAssetsVersion() {
   return _axios["default"].post("".concat(domain, "/api/v1/metas/list"), {
     filter: {
       fields: [],
@@ -50,9 +50,9 @@ var getAssetsVersion = function getAssetsVersion() {
   });
 };
 
-exports.getAssetsVersion = getAssetsVersion;
+exports.fetchAssetsVersion = fetchAssetsVersion;
 
-var getAssetsUri = function getAssetsUri(version) {
+var fetchAssetsUri = function fetchAssetsUri(version) {
   return _axios["default"].post("".concat(domain, "/api/v1/metas/list"), {
     filter: {
       fields: [{
@@ -74,42 +74,47 @@ var getAssetsUri = function getAssetsUri(version) {
   });
 };
 
-exports.getAssetsUri = getAssetsUri;
+exports.fetchAssetsUri = fetchAssetsUri;
 
-var getAssets = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var _JSON$parse$;
+var hasCachedAssets = function hasCachedAssets(resVersion) {
+  var _JSON$parse$;
+
+  var cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
+  var cacheVersion = cacheAssets && ((_JSON$parse$ = JSON.parse(cacheAssets)[0]) === null || _JSON$parse$ === void 0 ? void 0 : _JSON$parse$.version);
+  return cacheAssets !== null && cacheVersion === resVersion;
+};
 
-    var res, cacheAssets, cacheVersion, resVersion, assetsUri;
+var getAssetsWithCache = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var res, cacheAssets, resVersion, assetsUri;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return getAssetsVersion();
+            return fetchAssetsVersion();
 
           case 2:
             res = _context.sent;
             cacheAssets = localStorage.getItem("".concat(storageKey, "version"));
-            cacheVersion = cacheAssets && ((_JSON$parse$ = JSON.parse(cacheAssets)[0]) === null || _JSON$parse$ === void 0 ? void 0 : _JSON$parse$.version);
             resVersion = res[0].version;
 
-            if (!(cacheAssets !== null && cacheVersion === resVersion)) {
-              _context.next = 8;
+            if (!hasCachedAssets(resVersion)) {
+              _context.next = 7;
               break;
             }
 
             return _context.abrupt("return", JSON.parse(cacheAssets));
 
-          case 8:
-            _context.next = 10;
-            return getAssetsUri(resVersion);
+          case 7:
+            _context.next = 9;
+            return fetchAssetsUri(resVersion);
 
-          case 10:
+          case 9:
             assetsUri = _context.sent;
             return _context.abrupt("return", assetsUri);
 
-          case 12:
+          case 11:
           case "end":
             return _context.stop();
         }
@@ -117,9 +122,10 @@ var getAssets = /*#__PURE__*/function () {
     }, _callee);
   }));
 
-  return function getAssets() {
+  return function getAssetsWithCache() {
     return _ref.apply(this, arguments);
   };
 }();
 
-exports.getAssets = getAssets;
+var _default = getAssetsWithCache;
+exports["default"] = _default;

package/lib/components/superset-charts/fetch-assets-and-append/index.js

@@ -0,0 +1,79 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = exports.SingletonFetchAssetsAndAppend = void 0;
+
+var _appendAssets = _interopRequireDefault(require("./append-assets"));
+
+var _getAssetsWithCache = _interopRequireDefault(require("./get-assets-with-cache"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+
+var getAssetsAndAppend = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var assets, execute;
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return (0, _getAssetsWithCache["default"])();
+
+          case 2:
+            assets = _context.sent;
+            execute = new _appendAssets["default"]();
+            execute.setAssets(assets);
+            return _context.abrupt("return", execute.appendAssetsList());
+
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function getAssetsAndAppend() {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+var SingletonFetchAssetsAndAppend = function SingletonFetchAssetsAndAppend() {
+  var instance;
+  return /*#__PURE__*/function () {
+    var _Singlenton = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (!instance) {
+                instance = getAssetsAndAppend();
+              }
+
+              return _context2.abrupt("return", instance);
+
+            case 2:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    }));
+
+    function Singlenton() {
+      return _Singlenton.apply(this, arguments);
+    }
+
+    return Singlenton;
+  }();
+};
+
+exports.SingletonFetchAssetsAndAppend = SingletonFetchAssetsAndAppend;
+var _default = SingletonFetchAssetsAndAppend;
+exports["default"] = _default;

package/lib/components/superset-charts/utils/axios.js

@@ -38,8 +38,12 @@ function setToken(token) {
 
 var getJwtToken = function getJwtToken() {
   return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/const/skynetToken")).then(function (res) {
-    setToken(JSON.parse(res.data.Data.obj).token);
-    return JSON.parse(res.data.Data.obj).token;
+    if (res.data.Data) {
+      setToken(JSON.parse(res.data.Data.obj).token);
+      return JSON.parse(res.data.Data.obj).token;
+    }
+
+    return "";
   });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.47",
+  "version": "1.10.50",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",