xframelib 0.5.7 → 0.6.0

package/dist/model/Config.d.ts

@@ -42,9 +42,13 @@ export interface IUIObject {
  */
 export interface IServiceURL {
     /**
-     * 用户登录（统一用户登录）
+     * 用户登录验证服务（统一用户登录:后台）
      */
     LoginAuthURL?: string;
+    /**
+     * 用户登录界面（统一用户登录界面:前台）
+     */
+    UILoginURL?: string;
     /**
      * 文件管理服务地址（统一文件管理：后台）
      */
@@ -52,11 +56,15 @@ export interface IServiceURL {
     /**
      * 文件管理（统一文件管理：前台）
      */
-    FileOnlineURL?: string;
+    UIFileURL?: string;
     /**
-     * 在线日志服务（统一文件管理）
+     * 在线日志服务（统一日志记录）
      */
     LogServiceURL?: string;
+    /**
+     * 图标在线服务地址
+     */
+    IconServiceURL?: string;
     /**
      * Axios普通WebAPI的BaseURL
      * 全局默认的http请求地址（一般与主hprose相同或不同）;文件上传地址
@@ -76,21 +84,21 @@ export interface IServiceURL {
  */
 export interface IMapKeys {
     /**
-     * 天地图Key
+     * 天地图Key ,单个或数组
      */
-    TDTKey?: string;
+    TDTKey?: string | string[];
     /**
-     * MapboxKey
+     * MapboxKey ,单个或数组
      */
-    MapboxKey?: string;
+    MapboxKey?: string | string[];
     /**
-     * Cesium Key
+     * Cesium Key ,单个或数组
      */
-    CesiumKey?: string;
+    CesiumKey?: string | string[];
     /**
-     * Google地图Key
+     * Google地图Key ,单个或数组
      */
-    GoogleKey?: string;
+    GoogleKey?: string | string[];
     /**
      * 其他扩展的Key属性
      */

package/dist/model/Constants.d.ts

@@ -7,9 +7,9 @@ export declare const TOKEN_REFRESH_TIME: number;
  */
 export declare const USER_TOKEN_API: {
     Login: string;
-    CheckLogin: string;
+    ChangeMyPwd: string;
     Logout: string;
-    ChangePWD: string;
     RefreshToken: string;
     CheckToken: string;
+    GetSystemRights: string;
 };

package/dist/model/IRole.d.ts

@@ -8,6 +8,7 @@ export interface IRoleRoute {
     title?: string;
     index?: number;
     children?: IRoleRoute[];
+    selected?: boolean;
 }
 /**
  * Widget菜单控制
@@ -18,6 +19,7 @@ export interface IRoleWidgetMenu {
     path?: string;
     type?: number;
     children?: Array<IRoleWidgetMenu>;
+    selected?: boolean;
 }
 /**
  * Widget组件权限控制
@@ -51,6 +53,7 @@ export interface IRoleWidget {
      * 所属组，用于业务分类
      */
     group?: string;
+    selected?: boolean;
 }
 /**
  * 功能点列表，用于功能点上报和权限过滤
@@ -59,6 +62,7 @@ export interface IRoleFunction {
     id: string;
     name: string;
     children?: Array<IRoleFunction>;
+    selected?: boolean;
 }
 /**
  * 系统权限路由菜单-总对象

package/dist/model/{Token.d.ts → IUserModel.d.ts}

@@ -2,15 +2,10 @@
  * 当前存储的token对象
  */
 export interface ITokenInfo {
-    id: string;
-    name: string;
     token: string;
     expire: string;
     refresh: string;
-    issystem?: boolean;
-    issecurity?: boolean;
     appkey?: string;
-    role?: string;
 }
 /**
  * 单个token对象内容
@@ -46,25 +41,27 @@ export interface ISystemUser {
     /**
      * 用户ID
      */
-    id: string;
+    id?: string;
     /**
      * 用户名
      */
-    name: string;
+    name?: string;
+    doubletoken?: IDoubleToken;
+    roles?: IUserRole[];
     /**
-     * 用户组ID
+     * 外部绑定用户信息ID
      */
-    groupid?: string;
-    photo?: string;
-    mobile?: string;
-    qq?: string;
-    email?: string;
-    img?: string;
-    issystem?: boolean;
-    createtime?: string;
-    updatetime?: string;
-    issecurity?: boolean;
-    appkey?: string;
-    role?: string;
-    doubleToken?: IDoubleToken;
+    bindid?: string;
+}
+export interface IUserRole {
+    id: string;
+    name: string;
+    level: number;
+    createrid?: string;
+    syslist?: IUserSystem[];
+}
+export interface IUserSystem {
+    id: string;
+    name: string;
+    version: string;
 }

package/dist/model/Layout.d.ts

@@ -24,6 +24,10 @@ export interface IWidgetLayout {
     height?: string;
 }
 export interface IWidgetConfig {
+    /**
+     * Layout标识名,以支撑多个布局使用
+     */
+    layoutID?: string;
     /**
      * 唯一ID,与组件名一致
      */
@@ -57,13 +61,13 @@ export interface IWidgetConfig {
      */
     preload?: boolean;
     /**
-     * 前置容器ID,一般也就是bindid
+     * 前置组件 ID,一般也就是bindid
      */
     afterid?: string;
     /**
-     * 绑定依赖容器ID,不一定有afterid
+     * 20220424 WM:暂时去掉，容易混乱和循环引用
+     * 绑定依赖组件ID,不一定有afterid
      */
-    bindid?: string;
     /**
      * 所属组，用于业务分类
      */
@@ -72,4 +76,8 @@ export interface IWidgetConfig {
      * 外部定义布局(备用)
      */
     layout?: IWidgetLayout;
+    /**
+     * 扩展属性，支持应用
+     */
+    [props: string]: any;
 }

package/dist/model/index.d.ts

@@ -1,4 +1,5 @@
 export * from './Config';
-export * from './Token';
+export * from './IUserModel';
 export * from './Constants';
 export * from './Layout';
+export * from './IRole';

package/dist/permission/RoleSysRightHelper.d.ts

@@ -0,0 +1,27 @@
+import { ISysRoleRight } from '../model/IRole';
+/**
+ * 删除非选中节点
+ * @param childrenNodes
+ */
+export declare function handleNodes(childrenNodes: any[]): void;
+/**
+ * 新旧合并
+ * @param newNodes
+ * @param oldNodes
+ * @param fieldName
+ */
+export declare function mergeNodes(newNodes: any[], oldNodes: any[], fieldName?: string): void;
+/**
+ *
+ * @param jsonObj
+ * @param jsonObjOld
+ * @param groupName 'routes'|'widgetMenu'|'widgets'|'functions'
+ * @param fieldName 主键字段名
+ */
+export declare function mergeNodesAll(jsonObj: ISysRoleRight, jsonObjOld: ISysRoleRight, groupName: string, fieldName?: string): void;
+/**
+ * 融合过滤角色权限功能
+ * @param jsonObjArray ISysRoleRight对象数组
+ * @returns
+ */
+export declare function mergeFilterRoleSysRight(jsonObjArray: any[]): ISysRoleRight | undefined;

package/dist/permission/filter.d.ts

@@ -8,31 +8,38 @@ declare type IWidgetMenu = any;
  */
 export declare function getCurrentSystemRight(): ISysRoleRight | undefined;
 /**
- * 获取用户角色权限菜单
+ * 获取用户角色权限列表对象
  * @param sysID 系统ID
- * @param roleAPI 获取系统角色权限的API
- * @param fullSysRights 默认全部，调试开发使用
+ * @param isSuperLevel 当前用户的最高等级
  * @returns
  */
-export declare function getSystemRoleRight(sysID: string, roleAPI: string, baseLoginURL?: string, fullSysRights?: ISysRoleRight): Promise<ISysRoleRight | undefined>;
+export declare function getSystemRoleRight(sysID: string, isSuperLevel?: boolean): Promise<ISysRoleRight | undefined>;
 /**
  * 获取授权的Route 集合
+ * @param bussinessRoutes 全部业务路由
+ * @param roleLevel 角色级别，默认为普通用户，如果为0，则是超级管理员
  * @returns
  */
-export declare function getRoutes(bussinessRoutes: Array<RouteRecordRaw>): Array<RouteRecordRaw> | undefined;
+export declare function getRoutes(bussinessRoutes: Array<RouteRecordRaw>, roleLevel?: number): Array<RouteRecordRaw> | undefined;
 /**
  * 获取授权的Widget Menu集合
+ * @param widgetMenuConfig 全部widget配置
+ * @param roleLevel 角色级别，默认为普通用户，如果为0，则是超级管理员
  * @returns
  */
-export declare function getWidgetMenus(widgetMenuConfig: Array<IWidgetMenu>): Array<IWidgetMenu> | undefined;
+export declare function getWidgetMenus(widgetMenuConfig: Array<IWidgetMenu>, roleLevel?: number): Array<IWidgetMenu> | undefined;
 /**
  * 获取授权的 widget配置对象集合
+ * @param widgetConfig 全部
+ * @param roleLevel 角色级别，默认为普通用户，如果为0，则是超级管理员
  * @returns
  */
-export declare function getWidgetConfig(widgetConfig?: Array<IWidgetConfig>): Array<IWidgetConfig> | undefined;
+export declare function getWidgetConfig(widgetConfig?: Array<IWidgetConfig>, roleLevel?: number): Array<IWidgetConfig> | undefined;
 /**
  * 获取授权的功能点集合
+ * @param functionList 全部功能列表
+ * @param roleLevel 角色级别，默认为普通用户，如果为0，则是超级管理员
  * @returns
  */
-export declare function getFunctions(functionList?: Array<IRoleFunction>): IRoleFunction[] | undefined;
+export declare function getFunctions(functionList?: Array<IRoleFunction>, roleLevel?: number): IRoleFunction[] | undefined;
 export {};

package/dist/permission/index.d.ts

@@ -1,3 +1,4 @@
 export * from './register';
 export * from './filter';
 export * from './right';
+export * from './RoleSysRightHelper';

package/dist/permission/right.d.ts

@@ -8,7 +8,7 @@ export declare function getRight(): ISysRoleRight | undefined;
  * 设置 系统角色权限 对象
  * @param sysRoleRight 系统角色权限对象
  */
-export declare function setRight(sysRoleRight: ISysRoleRight): void;
+export declare function setRight(sysRoleRight?: ISysRoleRight): void;
 /**
  * 清除
  */

package/dist/public/mitm.html

@@ -1,180 +1,180 @@
-<!--
-	mitm.html is the lite "man in the middle"
-
-	This is only meant to signal the opener's messageChannel to
-	the service worker - when that is done this mitm can be closed
-    but it's better to keep it alive since this also stops the sw
-    from restarting
-
-	The service worker is capable of intercepting all request and fork their
-	own "fake" response - wish we are going to craft
-	when the worker then receives a stream then the worker will tell the opener
-	to open up a link that will start the download
--->
-<script>
-  // This will prevent the sw from restarting
-  let keepAlive = () => {
-    keepAlive = () => {};
-    var ping = location.href.substring(0, location.href.lastIndexOf('/')) + '/ping';
-    var interval = setInterval(() => {
-      if (sw) {
-        sw.postMessage('ping');
-      } else {
-        fetch(ping).then(res => res.text(!res.ok && clearInterval(interval)));
-      }
-    }, 10000);
-  };
-
-  // message event is the first thing we need to setup a listner for
-  // don't want the opener to do a random timeout - instead they can listen for
-  // the ready event
-  // but since we need to wait for the Service Worker registration, we store the
-  // message for later
-  let messages = [];
-  window.onmessage = evt => messages.push(evt);
-
-  let sw = null;
-  let scope = '';
-
-  function registerWorker() {
-    return navigator.serviceWorker
-      .getRegistration('./')
-      .then(swReg => {
-        return swReg || navigator.serviceWorker.register('sw.js', { scope: './' });
-      })
-      .then(swReg => {
-        const swRegTmp = swReg.installing || swReg.waiting;
-
-        scope = swReg.scope;
-
-        return (
-          (sw = swReg.active) ||
-          new Promise(resolve => {
-            swRegTmp.addEventListener(
-              'statechange',
-              (fn = () => {
-                if (swRegTmp.state === 'activated') {
-                  swRegTmp.removeEventListener('statechange', fn);
-                  sw = swReg.active;
-                  resolve();
-                }
-              })
-            );
-          })
-        );
-      });
-  }
-
-  // Now that we have the Service Worker registered we can process messages
-  function onMessage(event) {
-    let { data, ports, origin } = event;
-
-    // It's important to have a messageChannel, don't want to interfere
-    // with other simultaneous downloads
-    if (!ports || !ports.length) {
-      throw new TypeError("[StreamSaver] You didn't send a messageChannel");
-    }
-
-    if (typeof data !== 'object') {
-      throw new TypeError("[StreamSaver] You didn't send a object");
-    }
-
-    // the default public service worker for StreamSaver is shared among others.
-    // so all download links needs to be prefixed to avoid any other conflict
-    data.origin = origin;
-
-    // if we ever (in some feature versoin of streamsaver) would like to
-    // redirect back to the page of who initiated a http request
-    data.referrer = data.referrer || document.referrer || origin;
-
-    // pass along version for possible backwards compatibility in sw.js
-    data.streamSaverVersion = new URLSearchParams(location.search).get('version');
-
-    if (data.streamSaverVersion === '1.2.0') {
-      console.warn('[StreamSaver] please update streamsaver');
-    }
-
-    /** @since v2.0.0 */
-    if (!data.headers) {
-      console.warn(
-        "[StreamSaver] pass `data.headers` that you would like to pass along to the service worker\nit should be a 2D array or a key/val object that fetch's Headers api accepts"
-      );
-    } else {
-      // test if it's correct
-      // should thorw a typeError if not
-      new Headers(data.headers);
-    }
-
-    /** @since v2.0.0 */
-    if (typeof data.filename === 'string') {
-      console.warn(
-        "[StreamSaver] You shouldn't send `data.filename` anymore. It should be included in the Content-Disposition header option"
-      );
-      // Do what File constructor do with fileNames
-      data.filename = data.filename.replace(/\//g, ':');
-    }
-
-    /** @since v2.0.0 */
-    if (data.size) {
-      console.warn(
-        "[StreamSaver] You shouldn't send `data.size` anymore. It should be included in the content-length header option"
-      );
-    }
-
-    /** @since v2.0.0 */
-    if (data.readableStream) {
-      console.warn(
-        '[StreamSaver] You should send the readableStream in the messageChannel, not throught mitm'
-      );
-    }
-
-    /** @since v2.0.0 */
-    if (!data.pathname) {
-      console.warn('[StreamSaver] Please send `data.pathname` (eg: /pictures/summer.jpg)');
-      data.pathname = Math.random().toString().slice(-6) + '/' + data.filename;
-    }
-
-    // remove all leading slashes
-    data.pathname = data.pathname.replace(/^\/+/g, '');
-
-    // remove protocol
-    let org = origin.replace(/(^\w+:|^)\/\//, '');
-
-    // set the absolute pathname to the download url.
-    data.url = new URL(`${scope + org}/${data.pathname}`).toString();
-
-    if (!data.url.startsWith(`${scope + org}/`)) {
-      throw new TypeError('[StreamSaver] bad `data.pathname`');
-    }
-
-    // This sends the message data as well as transferring
-    // messageChannel.port2 to the service worker. The service worker can
-    // then use the transferred port to reply via postMessage(), which
-    // will in turn trigger the onmessage handler on messageChannel.port1.
-
-    const transferable = data.readableStream ? [ports[0], data.readableStream] : [ports[0]];
-
-    if (!(data.readableStream || data.transferringReadable)) {
-      keepAlive();
-    }
-
-    return sw.postMessage(data, transferable);
-  }
-
-  if (window.opener) {
-    // The opener can't listen to onload event, so we need to help em out!
-    // (telling them that we are ready to accept postMessage's)
-    window.opener.postMessage('StreamSaver::loadedPopup', '*');
-  }
-
-  if (navigator.serviceWorker) {
-    registerWorker().then(() => {
-      window.onmessage = onMessage;
-      messages.forEach(window.onmessage);
-    });
-  } else {
-    // FF can ping sw with fetch from a secure hidden iframe
-    // shouldn't really be possible?
-    keepAlive();
-  }
-</script>
+<!--
+	mitm.html is the lite "man in the middle"
+
+	This is only meant to signal the opener's messageChannel to
+	the service worker - when that is done this mitm can be closed
+    but it's better to keep it alive since this also stops the sw
+    from restarting
+
+	The service worker is capable of intercepting all request and fork their
+	own "fake" response - wish we are going to craft
+	when the worker then receives a stream then the worker will tell the opener
+	to open up a link that will start the download
+-->
+<script>
+  // This will prevent the sw from restarting
+  let keepAlive = () => {
+    keepAlive = () => {};
+    var ping = location.href.substring(0, location.href.lastIndexOf('/')) + '/ping';
+    var interval = setInterval(() => {
+      if (sw) {
+        sw.postMessage('ping');
+      } else {
+        fetch(ping).then(res => res.text(!res.ok && clearInterval(interval)));
+      }
+    }, 10000);
+  };
+
+  // message event is the first thing we need to setup a listner for
+  // don't want the opener to do a random timeout - instead they can listen for
+  // the ready event
+  // but since we need to wait for the Service Worker registration, we store the
+  // message for later
+  let messages = [];
+  window.onmessage = evt => messages.push(evt);
+
+  let sw = null;
+  let scope = '';
+
+  function registerWorker() {
+    return navigator.serviceWorker
+      .getRegistration('./')
+      .then(swReg => {
+        return swReg || navigator.serviceWorker.register('sw.js', { scope: './' });
+      })
+      .then(swReg => {
+        const swRegTmp = swReg.installing || swReg.waiting;
+
+        scope = swReg.scope;
+
+        return (
+          (sw = swReg.active) ||
+          new Promise(resolve => {
+            swRegTmp.addEventListener(
+              'statechange',
+              (fn = () => {
+                if (swRegTmp.state === 'activated') {
+                  swRegTmp.removeEventListener('statechange', fn);
+                  sw = swReg.active;
+                  resolve();
+                }
+              })
+            );
+          })
+        );
+      });
+  }
+
+  // Now that we have the Service Worker registered we can process messages
+  function onMessage(event) {
+    let { data, ports, origin } = event;
+
+    // It's important to have a messageChannel, don't want to interfere
+    // with other simultaneous downloads
+    if (!ports || !ports.length) {
+      throw new TypeError("[StreamSaver] You didn't send a messageChannel");
+    }
+
+    if (typeof data !== 'object') {
+      throw new TypeError("[StreamSaver] You didn't send a object");
+    }
+
+    // the default public service worker for StreamSaver is shared among others.
+    // so all download links needs to be prefixed to avoid any other conflict
+    data.origin = origin;
+
+    // if we ever (in some feature versoin of streamsaver) would like to
+    // redirect back to the page of who initiated a http request
+    data.referrer = data.referrer || document.referrer || origin;
+
+    // pass along version for possible backwards compatibility in sw.js
+    data.streamSaverVersion = new URLSearchParams(location.search).get('version');
+
+    if (data.streamSaverVersion === '1.2.0') {
+      console.warn('[StreamSaver] please update streamsaver');
+    }
+
+    /** @since v2.0.0 */
+    if (!data.headers) {
+      console.warn(
+        "[StreamSaver] pass `data.headers` that you would like to pass along to the service worker\nit should be a 2D array or a key/val object that fetch's Headers api accepts"
+      );
+    } else {
+      // test if it's correct
+      // should thorw a typeError if not
+      new Headers(data.headers);
+    }
+
+    /** @since v2.0.0 */
+    if (typeof data.filename === 'string') {
+      console.warn(
+        "[StreamSaver] You shouldn't send `data.filename` anymore. It should be included in the Content-Disposition header option"
+      );
+      // Do what File constructor do with fileNames
+      data.filename = data.filename.replace(/\//g, ':');
+    }
+
+    /** @since v2.0.0 */
+    if (data.size) {
+      console.warn(
+        "[StreamSaver] You shouldn't send `data.size` anymore. It should be included in the content-length header option"
+      );
+    }
+
+    /** @since v2.0.0 */
+    if (data.readableStream) {
+      console.warn(
+        '[StreamSaver] You should send the readableStream in the messageChannel, not throught mitm'
+      );
+    }
+
+    /** @since v2.0.0 */
+    if (!data.pathname) {
+      console.warn('[StreamSaver] Please send `data.pathname` (eg: /pictures/summer.jpg)');
+      data.pathname = Math.random().toString().slice(-6) + '/' + data.filename;
+    }
+
+    // remove all leading slashes
+    data.pathname = data.pathname.replace(/^\/+/g, '');
+
+    // remove protocol
+    let org = origin.replace(/(^\w+:|^)\/\//, '');
+
+    // set the absolute pathname to the download url.
+    data.url = new URL(`${scope + org}/${data.pathname}`).toString();
+
+    if (!data.url.startsWith(`${scope + org}/`)) {
+      throw new TypeError('[StreamSaver] bad `data.pathname`');
+    }
+
+    // This sends the message data as well as transferring
+    // messageChannel.port2 to the service worker. The service worker can
+    // then use the transferred port to reply via postMessage(), which
+    // will in turn trigger the onmessage handler on messageChannel.port1.
+
+    const transferable = data.readableStream ? [ports[0], data.readableStream] : [ports[0]];
+
+    if (!(data.readableStream || data.transferringReadable)) {
+      keepAlive();
+    }
+
+    return sw.postMessage(data, transferable);
+  }
+
+  if (window.opener) {
+    // The opener can't listen to onload event, so we need to help em out!
+    // (telling them that we are ready to accept postMessage's)
+    window.opener.postMessage('StreamSaver::loadedPopup', '*');
+  }
+
+  if (navigator.serviceWorker) {
+    registerWorker().then(() => {
+      window.onmessage = onMessage;
+      messages.forEach(window.onmessage);
+    });
+  } else {
+    // FF can ping sw with fetch from a secure hidden iframe
+    // shouldn't really be possible?
+    keepAlive();
+  }
+</script>