@cloud-app-dev/vidc 2.0.0-alpha.6 → 2.0.0-alpha.7

package/es/Config/index.js

@@ -1,4 +1,5 @@
 import produce from 'immer';
+import { formartThemeConfig } from './utils';
 var Config = {
   app: produce({}, function () {}),
   bs: produce({}, function () {}),
@@ -29,8 +30,11 @@ var Config = {
   },
   registerThemeConfig: function registerThemeConfig(theme) {
     Config.theme = produce(Config.theme, function (draft) {
-      draft = theme;
+      draft = formartThemeConfig(theme);
     });
+  },
+  getThemeVarValue: function getThemeVarValue(themeKey) {
+    return getComputedStyle(document.querySelector(':root')).getPropertyValue("--".concat(themeKey));
   }
 };
 

package/es/Config/interface.d.ts

@@ -31,6 +31,14 @@ export type BSConfigType = {
   chromeDownloadUrl: string;
 };
 
+export type ThemeInfoType = {
+  vars: { [key: string]: string[] };
+  style: {
+    menuType: 'inline' | 'horizontal';
+    hasTab: boolean;
+  };
+};
+
 export type ConfigKey = 'app' | 'feature' | 'pFeature' | 'bs';
 
 export type ConfigJOSN = {
@@ -38,12 +46,12 @@ export type ConfigJOSN = {
   feature: FeatureItemType[];
   pFeature: FeatureItemType[];
   bs: BSConfigType;
-  theme: any;
+  theme: ThemeInfoType;
   registerAppConfig: (conf: AppItemType[]) => void;
   registerFeatrue: (conf: FeatureItemType[]) => void;
   registerBSConfig: (conf: BSConfigType) => void;
   registerPlatformFeature: (conf: FeatureItemType[]) => void;
-  registerThemeConfig: (conf: { [key: string]: any }) => void;
+  registerThemeConfig: (conf: ThemeInfoType) => void;
 
   [key: string]: any;
 };

package/es/Config/utils.d.ts

@@ -1,18 +1,2 @@
-import { ConfigJOSN } from './interface';
-export declare function formartThemeConfig(options: ConfigJOSN): {
-    [x: string]: any;
-    app: {
-        [key: string]: import("./interface").AppItemType;
-    };
-    feature: import("./interface").FeatureItemType[];
-    pFeature: import("./interface").FeatureItemType[];
-    bs: import("./interface").BSConfigType;
-    theme: any;
-    registerAppConfig: (conf: import("./interface").AppItemType[]) => void;
-    registerFeatrue: (conf: import("./interface").FeatureItemType[]) => void;
-    registerBSConfig: (conf: import("./interface").BSConfigType) => void;
-    registerPlatformFeature: (conf: import("./interface").FeatureItemType[]) => void;
-    registerThemeConfig: (conf: {
-        [key: string]: any;
-    }) => void;
-};
+import { ThemeInfoType } from './interface';
+export declare function formartThemeConfig(options: ThemeInfoType): ThemeInfoType;

package/es/Config/utils.js

@@ -24,9 +24,6 @@ export function formartThemeConfig(options) {
   var _ref;
 
   var tplStr = ':root{<content>}';
-  var data = Object.assign({}, options);
-  data.vars = {};
-  data.style = {};
 
   var attrArr = (_ref = []).concat.apply(_ref, _toConsumableArray(Object.values(options.vars)));
 
@@ -44,11 +41,5 @@ export function formartThemeConfig(options) {
     document.head.appendChild(style);
   }
 
-  if (options.style) {
-    Object.keys(options.style).forEach(function (k) {
-      data.style[k] = options.style[k];
-    });
-  }
-
-  return data;
+  return options;
 }

package/es/InitialRequest/index.js

@@ -1,3 +1,5 @@
+import _nextTick from "@cloud-app-dev/utils/es/nextTick";
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -40,7 +42,7 @@ function InitialRequest(_ref) {
 
     var init = function init() {
       return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-        var _yield$initialization, userPrivileges, centerPrivileges, centerInfo, userInfo;
+        var _yield$initialization, userFeatures, operationInfo, systemFeatures, userInfo;
 
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
@@ -51,15 +53,19 @@ function InitialRequest(_ref) {
 
               case 2:
                 _yield$initialization = _context.sent;
-                userPrivileges = _yield$initialization.userPrivileges;
-                centerPrivileges = _yield$initialization.centerPrivileges;
-                centerInfo = _yield$initialization.centerInfo;
+                userFeatures = _yield$initialization.userFeatures;
+                operationInfo = _yield$initialization.operationInfo;
+                systemFeatures = _yield$initialization.systemFeatures;
                 userInfo = _yield$initialization.userInfo;
                 updateUser(userInfo);
-                updateOperation(centerInfo);
-                Config.registerFeatrue(userPrivileges);
-                Config.registerPlatformFeature(centerPrivileges);
-                setIsInit(true);
+                updateOperation(operationInfo);
+                Config.registerFeatrue(userFeatures);
+                Config.registerPlatformFeature(systemFeatures);
+
+                _nextTick(function () {
+                  return setIsInit(true);
+                });
+
                 _BASE_DATA_INIT = true;
 
               case 13:

package/es/InitialRequest/utils.d.ts

@@ -2,7 +2,7 @@ import { UserInfoType, OperationInfoType } from '../AppContext/interface';
 import { FeatureItemType } from '../Config/interface';
 export declare function initialization(): Promise<{
     userInfo: UserInfoType;
-    userPrivileges: FeatureItemType[];
-    centerPrivileges: FeatureItemType[];
-    centerInfo: OperationInfoType;
+    userFeatures: FeatureItemType[];
+    systemFeatures: FeatureItemType[];
+    operationInfo: OperationInfoType;
 }>;

package/es/InitialRequest/utils.js

@@ -29,8 +29,10 @@ function catchPromise(fn) {
 
 var method = 'post';
 export function initialization() {
+  var _a;
+
   return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var headers, result, userInfo, userId, operationCenterId, data, data2, centerUrl, centerInfo, themeInfo, themeConfig, themeId, themeUrl, themeRes, userPrivilegesUrl, centerPrivilegesUrl, _yield$Promise$all, _yield$Promise$all2, _yield$Promise$all2$, userPrivileges, _yield$Promise$all2$2, centerPrivileges;
+    var headers, result, userInfo, userId, operationCenterId, data, data2, centerUrl, centerInfo, themeInfo, themeConfig, userPrivilegesUrl, systemFeatureUrl, _yield$Promise$all, _yield$Promise$all2, _yield$Promise$all2$, userFeatures, _yield$Promise$all2$2, systemFeatures;
 
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
@@ -43,8 +45,7 @@ export function initialization() {
             return Service.$http({
               url: '/api/user/v1/getUserByToken',
               method: method,
-              headers: headers,
-              requestId: 'getUserInfo'
+              headers: headers
             });
 
           case 3:
@@ -64,50 +65,31 @@ export function initialization() {
               data: data2,
               method: method,
               url: centerUrl,
-              headers: headers,
-              requestId: 'operationCenterInfo'
+              headers: headers
             });
 
           case 12:
             centerInfo = _context.sent;
             _context.next = 15;
             return Service.$http({
-              url: "/api/micro/configureApplication/v1/queryConfigureApplicationById/".concat(operationCenterId)
+              url: '/api/system/config/type',
+              data: {
+                type: 'theme',
+                systemId: operationCenterId
+              }
             });
 
           case 15:
             themeInfo = _context.sent;
-            themeConfig = themeInfo.data || {}; // eslint-disable-next-line no-eval
+            themeConfig = (_a = themeInfo === null || themeInfo === void 0 ? void 0 : themeInfo.data) === null || _a === void 0 ? void 0 : _a.content;
 
-            themeId = themeConfig.themeId || centerInfo.data.hues;
-
-            if (!themeId) {
-              _context.next = 24;
-              break;
+            if (themeConfig) {
+              Config.registerThemeConfig(themeConfig);
             }
 
-            themeUrl = "/api/micro/configure/v1/queryConfigureByConfigureId/".concat(themeId);
-            _context.next = 22;
-            return Service.$http({
-              data: data2,
-              method: 'get',
-              url: themeUrl,
-              headers: headers
-            });
-
-          case 22:
-            themeRes = _context.sent;
-
-            try {
-              Config.registerThemeConfig(themeRes.data);
-            } catch (e) {
-              console.error(e);
-            }
-
-          case 24:
             userPrivilegesUrl = "/api/user/role/v1/queryUserRoles/".concat(userId);
-            centerPrivilegesUrl = "/api/micro/applicationSystemScene/v1/queryAllFunctionByApplicationSystemId/".concat(operationCenterId);
-            _context.next = 28;
+            systemFeatureUrl = "/api/system/".concat(operationCenterId, "/list");
+            _context.next = 22;
             return Promise.all([catchPromise(Service.$http({
               data: data,
               method: method,
@@ -116,29 +98,29 @@ export function initialization() {
             })), catchPromise(Service.$http({
               data: data2,
               method: 'get',
-              url: centerPrivilegesUrl,
+              url: systemFeatureUrl,
               headers: headers
             }))]);
 
-          case 28:
+          case 22:
             _yield$Promise$all = _context.sent;
             _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
             _yield$Promise$all2$ = _yield$Promise$all2[0];
-            userPrivileges = _yield$Promise$all2$ === void 0 ? {
+            userFeatures = _yield$Promise$all2$ === void 0 ? {
               data: []
             } : _yield$Promise$all2$;
             _yield$Promise$all2$2 = _yield$Promise$all2[1];
-            centerPrivileges = _yield$Promise$all2$2 === void 0 ? {
+            systemFeatures = _yield$Promise$all2$2 === void 0 ? {
               data: []
             } : _yield$Promise$all2$2;
             return _context.abrupt("return", {
               userInfo: userInfo,
-              userPrivileges: userPrivileges.data,
-              centerPrivileges: centerPrivileges.data,
-              centerInfo: centerInfo
+              userFeatures: userFeatures.data,
+              systemFeatures: systemFeatures.data,
+              operationInfo: centerInfo.data
             });
 
-          case 35:
+          case 29:
           case "end":
             return _context.stop();
         }

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "2.0.0-alpha.6",
+  "version": "2.0.0-alpha.7",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",