xframelib 0.5.9 → 0.6.2

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

@@ -2,6 +2,10 @@
  * 刷新提前量(毫秒,ms)
  */
 export declare const TOKEN_REFRESH_TIME: number;
+/**
+ * 默认的Token最大有效间隔时间，60分钟，60*60*1000
+ */
+export declare const TOKEN_VALID_TIMESPAN: number;
 /**
  * 用户和Token相关服务API
  */

package/dist/public/WSynchro.js

@@ -0,0 +1,67 @@
+/** WSynchro object to synchronize windows
+*	- windows: array of windows to synchro (
+*	- source: the window source (undefined if first window)
+*/
+if (!window.WSynchro) {
+	var WSynchro = { windows: [] };
+}
+/** Open a new window to synchronize
+*	@param {url|undefined} url to open, default current window url
+*	@param {specs|undefined|null} specs (as for window.open), undefined to open in a new window, null to open in a new tab, default new window
+*/
+WSynchro.open = function (href, specs)
+{	var w = window.open (href || window.location.href, "_blank", typeof(specs)=="undefined"? "location=1,menubar=1,toolbar=1,scrollbars=1" : specs);
+	if (!w.WSynchro) w.WSynchro = { windows: [ window ], source:window };
+	else
+	{	w.WSynchro.windows = [ window ];
+		w.WSynchro.source = window;
+	}
+	this.windows.push(w);
+}
+/**	Trigger function 
+*	@param {synchronize} 
+*	@param {function} synchronize function
+*/
+WSynchro.on = function (e, syncFn)
+{	if (!this.syncFn_) this.syncFn_ = [];
+	if (e==='synchronize') this.syncFn_.push(syncFn);
+}
+/**	Synchronize windows
+*	@param {Object|undefined} if undefined stop synchro (when the window is synchronize)
+*/
+WSynchro.synchronize = function(params)
+{	this.synchronize_ (params);
+}
+/**	Synchronize windows: 
+*	@param {Array} array of arguments to use with fn
+*	@param {} internal syncrho time to avoid stnchro loops
+*	@private
+*/
+WSynchro.synchronize_ = function(args, sync) {
+	var i;
+	// Stop condition 
+	if (!sync) 
+	{	if (this.synchronizing) sync = this.sync;
+		else this.sync = sync = (new Date()).getTime();
+		this.synchronizing = false;
+	}
+	else 
+	{	// Don't synchronize twice
+		if (sync == this.sync) return;
+		this.sync = sync;
+		this.synchronizing = true;
+		try
+		{	if (WSynchro.syncFn_)
+			{	args.type = "synchronize";
+				for (i=0; i<WSynchro.syncFn_.length; i++) 
+				{	WSynchro.syncFn_[i].apply (null, [args]);
+				}
+			}
+		} catch(e) { /* */ }
+	}
+	if (args) for (i=0; i<this.windows.length; i++)
+	{	try
+		{	this.windows[i].WSynchro.synchronize_(args, sync); 
+		} catch(e) { /* */ }
+	}
+}

package/dist/utils/FileUpload.d.ts

@@ -21,7 +21,7 @@ export interface FileUploadOptions {
 /**
  * 文件上传类
  */
-export default class FileUpload {
+export declare class FileUpload {
     endpoint: string | ((file?: File) => Promise<string>);
     file: File;
     headers: XhrHeaders;

package/dist/utils/H5Tool.d.ts

@@ -79,7 +79,16 @@ export default class H5Tool {
      * @param fileObj file对象
      * @param handleMd5Result 处理文件MD5结果
      */
-    static getFileShortMD5(fileObj: any, handleMd5Result: (data: {
+    static getFileShortMD5(fileObj: File, handleMd5Result: (data: {
+        isOK: boolean;
+        data: string;
+    }) => void): any;
+    /**
+     * 获取文件完整的MD5摘要
+     * @param fileObj
+     * @param handleMd5Result
+     */
+    static getFileMD5(fileObj: File, handleMd5Result: (data: {
         isOK: boolean;
         data: string;
     }) => void): any;

package/dist/utils/Storage.d.ts

@@ -10,7 +10,7 @@ declare class StorageHelper {
      * @description 设置缓存
      * @param {string} key 缓存键
      * @param {*} value 缓存值
-     * @param expire
+     * @param expire 超时时间为秒
      */
     set(key: string, value: any, expire?: number | null): void;
     /**
@@ -19,6 +19,15 @@ declare class StorageHelper {
      * @param {*=} def 默认值
      */
     get(key: string, def?: any): any;
+    /**
+     * 获取存储对象，带expire属性
+     * 返回：
+     * {
+     *  value:any,
+     *  expire:null|Time
+     * }
+     */
+    getJsonObject(key: string): any;
     /**
      * 从缓存删除某项
      * @param {string} key

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "xframelib",
-  "version": "0.5.9",
+  "version": "0.6.2",
   "description": "积累的前端开发基础库",
   "main": "dist/index.js",
   "common": "dist/index.cjs",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "dev": "vite --port 8090",
+    "dev": "vite --port 8099",
     "build": "vite build",
     "lib": "rollup -c ",
     "serve": "vite preview",
@@ -26,11 +26,11 @@
     "@hprose/io": "^3.0.10",
     "@hprose/rpc-core": "^3.0.10",
     "@hprose/rpc-html5": "^3.0.10",
+    "axios": "^0.26.1",
     "localforage": "^1.10.0",
     "spark-md5": "^3.0.2",
     "streamsaver": "^2.0.6",
-    "xhr": "^2.6.0",
-    "axios": "^0.26.1"
+    "xhr": "^2.6.0"
   },
   "devDependencies": {
     "@rollup/plugin-alias": "^3.1.9",