Merge branch 'ww' into 'main'

feat: according device select page size

See merge request huang/thingskit-drawio!33

@@ -14,7 +14,7 @@ const GLOBAL_TOKEN = (() => {
 	const common = ls.get(GLOBAL_STORAGE_KEY)
 	return {
 		token: common && common.JWT_TOKEN && common.JWT_TOKEN.value,
-		refreshToken: common && common.JWT_TOKEN && common.JWT_TOKEN.value,
+		refreshToken: common && common.REFRESH_TOKEN && common.REFRESH_TOKEN.value,
 	}
 })()
 

@@ -56,7 +56,7 @@ const createStorage = (
 		timeout = null,
 		hasEncrypt = !isDEV,
 	} = {}) => {
-	if (hasEncrypt && [ key.length, iv.length ].some((item) => item !== 16)) {
+	if (hasEncrypt && [key.length, iv.length].some((item) => item !== 16)) {
 		throw new Error('When hasEncrypt is true, the key or iv must be 16 bits!');
 	}
 
@@ -86,7 +86,7 @@ const createStorage = (
 		}
 
 		getKey(key) {
-			return `${ this.prefixKey }${ key }`.toUpperCase();
+			return `${this.prefixKey}${key}`.toUpperCase();
 		}
 
 		/**
@@ -110,6 +110,19 @@ const createStorage = (
 			this.storage.setItem(this.getKey(key), stringifyValue);
 		}
 
+		generatorValue(key, value, expire = timeout) {
+			const stringData = {
+				value,
+				time: Date.now(),
+				expire: !isNullOrUnDef(expire) ? new Date().getTime() + expire * 1000 : null,
+			};
+			const stringifyValue = this.hasEncrypt
+				? this.encryption.encryptByAES(stringData)
+				: stringData;
+
+			return stringifyValue
+		}
+
 		/**
 		 *Read cache
 		 * @param {string} key
@@ -117,17 +130,20 @@ const createStorage = (
 		 * @memberof Cache
 		 */
 		get(key, def = null) {
+			console.log(this.getKey(key))
 			const val = this.storage.getItem(this.getKey(key));
 			if (!val) return def;
 
 			try {
 				const decVal = this.hasEncrypt ? this.encryption.decryptByAES(val) : val;
 				const data = JSON.parse(decVal);
+				console.log(data)
 				const { value, expire } = data;
-				if (isNullOrUnDef(expire) || expire >= new Date().getTime()) {
-					return value;
-				}
-				this.remove(key);
+				// if (isNullOrUnDef(expire) || expire >= new Date().getTime()) {
+				// return value;
+				// }
+				return value
+				// this.remove(key);
 			} catch (e) {
 				return def;
 			}
@@ -150,4 +166,4 @@ const createStorage = (
 		}
 	};
 	return new WebStorage();
-}
\ No newline at end of file
+}

@@ -5027,6 +5027,31 @@ App.prototype.loadFile = function (id, sameWindow, file, success, force) {
 	function getSaveContent() {
 		defHttp.get('/yt/configuration/center/getConfigurationInfo/'+Editor.configurationId)
 			.then(function (response) {
+				console.log({response})
+				const { configurationContentList: [ data = {}] = [] } = response || {}
+				const phoneFlag = data.platform 
+				const pageSizeControl = PageSetupDialog.getFormats
+				PageSetupDialog.getFormats = function () {
+					if (phoneFlag === 'phone') {
+						return  [
+							{key: 'iPhone 8', title: 'iPhone 8', format: new mxRectangle(0, 0, 375, 667)},
+							{key: 'iPhone 8 Plus', title: 'iPhone 8 Plus', format: new mxRectangle(0, 0, 415, 737)},
+							{key: 'iPhone X/XS', title: 'iPhone X/XS', format: new mxRectangle(0, 0, 376, 813)},
+							{key: 'iPhone XR/XS Max', title: 'iPhone XR/XS Max', format: new mxRectangle(0, 0, 415, 897)},
+							{key: 'iPad 4', title: 'iPad 4', format: new mxRectangle(0, 0, 709, 1025)},
+							{key: 'Galaxy S9', title: 'Galaxy S9', format: new mxRectangle(0, 0, 361, 741)},
+							{key: 'Galaxy S10E', title: 'Galaxy S10E', format: new mxRectangle(0, 0, 361, 741)},
+							{key: 'Galaxy S10E', title: 'Galaxy S10E', format: new mxRectangle(0, 0, 361, 741)},
+							{key: 'Galaxy S10/S10+', title: 'Galaxy S10/S10+', format: new mxRectangle(0, 0, 413, 870)},
+							{key: 'Pixel 2', title: 'Pixel 2', format: new mxRectangle(0, 0, 413, 732)},
+							{key: 'Pixel 3', title: 'Pixel 3', format: new mxRectangle(0, 0, 413, 825)},
+							{key: 'Pixel 3', title: 'Pixel 3', format: new mxRectangle(0, 0, 413, 825)},
+							{key: 'Pixel XL', title: 'Pixel XL', format: new mxRectangle(0, 0, 413, 848)},
+							{key: 'custom', title: mxResources.get('custom'), format: null}
+						]
+					}
+					return pageSizeControl.apply(this, arguments)
+				}
 				Editor.configurationName = response.configurationName + ".drawio";
 				if(response.configurationContentList.length > 0){
 					response.configurationContentList.forEach((item)=>{

@@ -2065,24 +2065,33 @@ PageSetupDialog.addPageFormatPanel = function(div, namePostfix, pageFormat, page
  */
 PageSetupDialog.getFormats = function()
 {
-	return [{key: 'letter', title: 'US-Letter (8,5" x 11")', format: mxConstants.PAGE_FORMAT_LETTER_PORTRAIT},
-	        {key: 'legal', title: 'US-Legal (8,5" x 14")', format: new mxRectangle(0, 0, 850, 1400)},
-	        {key: 'tabloid', title: 'US-Tabloid (11" x 17")', format: new mxRectangle(0, 0, 1100, 1700)},
-	        {key: 'executive', title: 'US-Executive (7" x 10")', format: new mxRectangle(0, 0, 700, 1000)},
-	        {key: 'a0', title: 'A0 (841 mm x 1189 mm)', format: new mxRectangle(0, 0, 3300, 4681)},
-	        {key: 'a1', title: 'A1 (594 mm x 841 mm)', format: new mxRectangle(0, 0, 2339, 3300)},
-	        {key: 'a2', title: 'A2 (420 mm x 594 mm)', format: new mxRectangle(0, 0, 1654, 2336)},
-	        {key: 'a3', title: 'A3 (297 mm x 420 mm)', format: new mxRectangle(0, 0, 1169, 1654)},
-	        {key: 'a4', title: 'A4 (210 mm x 297 mm)', format: mxConstants.PAGE_FORMAT_A4_PORTRAIT},
-	        {key: 'a5', title: 'A5 (148 mm x 210 mm)', format: new mxRectangle(0, 0, 583, 827)},
-	        {key: 'a6', title: 'A6 (105 mm x 148 mm)', format: new mxRectangle(0, 0, 413, 583)},
-	        {key: 'a7', title: 'A7 (74 mm x 105 mm)', format: new mxRectangle(0, 0, 291, 413)},
-	        {key: 'b4', title: 'B4 (250 mm x 353 mm)', format: new mxRectangle(0, 0, 980, 1390)},
-	        {key: 'b5', title: 'B5 (176 mm x 250 mm)', format: new mxRectangle(0, 0, 690, 980)},
-	        {key: '16-9', title: '16:9 (1600 x 900)', format: new mxRectangle(0, 0, 900, 1600)},
-	        {key: '16-10', title: '16:10 (1920 x 1200)', format: new mxRectangle(0, 0, 1200, 1920)},
-	        {key: '4-3', title: '4:3 (1600 x 1200)', format: new mxRectangle(0, 0, 1200, 1600)},
-	        {key: 'custom', title: mxResources.get('custom'), format: null}];
+	// HACK thingsKit 页面尺寸控制
+
+	return [
+		{key: '1920 * 1080', title: '1920 * 1080(推荐尺寸)', format: new mxRectangle(0, 0, 1080, 1920)},
+		{key: '1060 * 520', title: '1060 * 520', format: new mxRectangle(0, 0, 520, 1060)},
+		{key: '1440 * 900', title: '1440 * 900', format: new mxRectangle(0, 0, 900, 1440)},
+		{key: '1366 * 768', title: '1366* 768', format: new mxRectangle(0, 0, 768, 1366)},
+		{key: 'custom', title: mxResources.get('custom'), format: null}
+	]
+	// return [{key: 'letter', title: 'US-Letter (8,5" x 11")', format: mxConstants.PAGE_FORMAT_LETTER_PORTRAIT},
+	//         {key: 'legal', title: 'US-Legal (8,5" x 14")', format: new mxRectangle(0, 0, 850, 1400)},
+	//         {key: 'tabloid', title: 'US-Tabloid (11" x 17")', format: new mxRectangle(0, 0, 1100, 1700)},
+	//         {key: 'executive', title: 'US-Executive (7" x 10")', format: new mxRectangle(0, 0, 700, 1000)},
+	//         {key: 'a0', title: 'A0 (841 mm x 1189 mm)', format: new mxRectangle(0, 0, 3300, 4681)},
+	//         {key: 'a1', title: 'A1 (594 mm x 841 mm)', format: new mxRectangle(0, 0, 2339, 3300)},
+	//         {key: 'a2', title: 'A2 (420 mm x 594 mm)', format: new mxRectangle(0, 0, 1654, 2336)},
+	//         {key: 'a3', title: 'A3 (297 mm x 420 mm)', format: new mxRectangle(0, 0, 1169, 1654)},
+	//         {key: 'a4', title: 'A4 (210 mm x 297 mm)', format: mxConstants.PAGE_FORMAT_A4_PORTRAIT},
+	//         {key: 'a5', title: 'A5 (148 mm x 210 mm)', format: new mxRectangle(0, 0, 583, 827)},
+	//         {key: 'a6', title: 'A6 (105 mm x 148 mm)', format: new mxRectangle(0, 0, 413, 583)},
+	//         {key: 'a7', title: 'A7 (74 mm x 105 mm)', format: new mxRectangle(0, 0, 291, 413)},
+	//         {key: 'b4', title: 'B4 (250 mm x 353 mm)', format: new mxRectangle(0, 0, 980, 1390)},
+	//         {key: 'b5', title: 'B5 (176 mm x 250 mm)', format: new mxRectangle(0, 0, 690, 980)},
+	//         {key: '16-9', title: '16:9 (1600 x 900)', format: new mxRectangle(0, 0, 900, 1600)},
+	//         {key: '16-10', title: '16:10 (1920 x 1200)', format: new mxRectangle(0, 0, 1200, 1920)},
+	//         {key: '4-3', title: '4:3 (1600 x 1200)', format: new mxRectangle(0, 0, 1200, 1600)},
+	//         {key: 'custom', title: mxResources.get('custom'), format: null}];
 };
 
 /**

@@ -2366,6 +2366,8 @@ EditorUi.prototype.initCanvas = function()
                     var t = graph.view.translate;
                     graph.view.setTranslate(Math.floor(t.x + cx / s), Math.floor(t.y + cy / s));
                 }
+								// HACK thingsKit 设置视图起点为0, 0
+								graph.view.setTranslate(0, 0)
             }
         });
 		

+let requestQueue = []
+
+const JWT_TOKEN_KEY = 'JWT_TOKEN';
+const REFRESH_TOKEN_KEY = 'REFRESH_TOKEN';
 /**
  * custom http request
  */
@@ -16,7 +20,11 @@ function createAxios(options) {
 
   instance.interceptors.request.use((config) => {
     config.headers["X-Authorization"] = "Bearer " + GLOBAL_TOKEN.token
+
     return config
+  }, (error) => {
+    console.log(error)
+    return error
   })
 
   /**
@@ -28,10 +36,73 @@ function createAxios(options) {
     },
     function (error) {
       if (error.response.status == 401) {
-        layer.alert('登录超时,请重新登录');
+        // layer.alert('登录超时,请重新登录');
+        // const config = error.config
+        // const url = config.url
+        // const method = config.method
+        // const data = config.data
+        // const flag = requestQueue.find(item => item.url === url)
+        // if (!flag) {
+        //   console.log(url, method, data)
+        //   requestQueue.push({ url, method, data })
+        // }
+
+        doRefreshToken()
       }
       return Promise.reject(error);
     }
   );
   return instance;
 }
+
+
+/**
+ * @description refresh token
+ * @param {} params 
+ * @returns 
+ */
+function doRefreshToken(params) {
+  const refreshToken = GLOBAL_TOKEN.refreshToken
+  console.log(GLOBAL_TOKEN)
+  return new Promise((resolve, reject) => {
+    axios.post('/api/auth/token',
+      { refreshToken },
+      {
+        headers: {
+          "content-type": "application/json; charset=UTF-8",
+          "X-Authorization": "Bearer " + GLOBAL_TOKEN.token,
+        },
+      })
+      .then(res => {
+
+        // 存储token
+        const { refreshToken, token } = res.data
+        Object.assign(GLOBAL_TOKEN, { refreshToken, token })
+        const ls = createStorage({ storage: localStorage })
+        const originData = ls.get(GLOBAL_STORAGE_KEY)
+        const newRefreshToken = ls.generatorValue(REFRESH_TOKEN_KEY, refreshToken, true)
+        const newToken = ls.generatorValue(REFRESH_TOKEN_KEY, token, true)
+        console.log(Object.assign(originData, { [REFRESH_TOKEN_KEY]: newRefreshToken, [JWT_TOKEN_KEY]: newToken }))
+        ls.set(GLOBAL_STORAGE_KEY, Object.assign(originData, { [REFRESH_TOKEN_KEY]: newRefreshToken, [JWT_TOKEN_KEY]: newToken }), true)
+
+        // try {
+        //   requestQueue.forEach(item => {
+        //     const { method, url, data } = item
+        //     console.log({ item })
+        //     defHttp[method](url, data)
+        //   })
+        //   requestQueue = []
+        // } catch (error) {
+
+        // }
+
+        window.location.reload()
+        resolve()
+      })
+      .catch((error) => {
+        const { origin } = window.location
+        window.location.href = `${origin}/login`
+        reject(error)
+      })
+  })
+}