xydata-tools 1.1.29 → 1.1.30

package/dist/components/uni-app/media-picker/shmily-drag-media.vue

@@ -186,7 +186,8 @@ export default {
 		enableAddButton: {
 			type: Boolean,
 			default: false
-		}
+		}, 
+	 
 	},
 	data() {
 		return {
@@ -205,7 +206,9 @@ export default {
 			changeStatus: true,
 			preStatus: true,
 			first: true,
-			lastTouchEndTime: null // 记录最后一次 touchend 的时间，用于避免重复触发
+			lastTouchEndTime: null, // 记录最后一次 touchend 的时间，用于避免重复触发
+			clickThreshold: 20,
+			longPressTime: 300
 		};
 	},
 	computed: {
@@ -447,12 +450,19 @@ export default {
 			item.zIndex = 99;
 			item.moveEnd = true;
 			this.tempItem = item;
+			
+			// 记录起始坐标，用于通过位移判断点击
+			item.startX = item.oldX;
+			item.startY = item.oldY;
+
 			this.timer = setTimeout(() => {
 				item.scale = this.scale;
 				item.opacity = this.opacity;
-				clearTimeout(this.timer);
-				this.timer = null;
-			}, 200);
+				if (this.timer) {
+					clearTimeout(this.timer);
+					this.timer = null;
+				}
+			}, this.longPressTime);
 		},
 		handleClick(item, type) {
 			// 设为disable后无法触发touch事件
@@ -485,13 +495,21 @@ export default {
 			}
 
 			// 判断是否为点击操作（而非拖动）
-			if (this.timer && this.preStatus && this.changeStatus && item.offset < 28.28) {
+			const moveDistance = Math.sqrt(Math.pow(item.oldX - (item.startX || 0), 2) + Math.pow(item.oldY - (item.startY || 0), 2));
+			const isClickAction = this.timer && moveDistance < this.rpx2px(this.clickThreshold);
+
+			if (isClickAction && this.preStatus && this.changeStatus) {
 				if (this.moveType === 'video') {
 					this.playVideo(item);
 				} else {
-					this.previewImage(item);
+					setTimeout(()=>{
+                        this.previewImage(item);
+                    },0)
 				}
-			} else if (this.timer) {
+			}
+
+			// 无论是否触发点击，都需清理计时器防止后续意外放大
+			if (this.timer) {
 				clearTimeout(this.timer);
 				this.timer = null;
 			}
@@ -688,6 +706,8 @@ export default {
 				id: this.guid(16),
 				disable: false,
 				offset: 0,
+				startX: 0,
+				startY: 0,
 				moveEnd: false,
 				loading: true
 			});

package/dist/components/xyAuthLayout/index.js

@@ -6,6 +6,7 @@ import { useEffect } from 'react';
 import { getSessionStorage, setSessionStorage, removeSessionStorage } from "../../utils/token.js";
 import { message, Spin } from 'antd';
 import { queryAaaCurrent, queryCurrent, accountAAALogout } from "../../services/service.js";
+import { getQueryVariable } from "../../utils/utils";
 
 // ========== 公共辅助函数 ==========
 
@@ -240,8 +241,9 @@ var XyAuthLayout = function XyAuthLayout(props) {
   var token = getSessionStorage('Token');
   var loginType = envData.login_type || 'BOTH';
   var pathName = window.location.pathname;
+  var loginId = getQueryVariable('loginId');
   useEffect(function () {
-    if (!token) {
+    if (!token && !(loginId && ['BOTH', 'AAA'].includes(loginType))) {
       // 当登录方式为SSO_NEW或BOTH时，可在路径加上sso进行统一登陆，当登录方式固定为SSO或SSO_NEW时，直接跳转到SSO登录
       if (['SSO_NEW', 'BOTH'].includes(loginType) && pathName.indexOf('/sso') >= 0 || ['SSO', 'SSO_NEW'].includes(loginType)) {
         setSessionStorage('sso_redirect_url', window.location.href);
@@ -251,11 +253,12 @@ var XyAuthLayout = function XyAuthLayout(props) {
         window.location.href = "".concat(window.publicPath || '/', "user/login");
       }
     } else {
-      getUserinfo();
+      // 当有TOKEN或者AAA登录并携带loginId时可进入
+      getUserinfo(loginId);
     }
   }, []);
   var getUserinfo = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(loginId) {
       var response;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -273,12 +276,16 @@ var XyAuthLayout = function XyAuthLayout(props) {
             break;
           case 7:
             _context4.next = 9;
-            return queryAaaCurrent({});
+            return queryAaaCurrent({}, {
+              headers: {
+                loginId: loginId
+              }
+            });
           case 9:
             _context4.t0 = _context4.sent;
           case 10:
             response = _context4.t0;
-            if (!((response === null || response === void 0 ? void 0 : response.status) === 401 || (response === null || response === void 0 ? void 0 : response.rspCode) === '401')) {
+            if (!((response === null || response === void 0 ? void 0 : response.status) === 401)) {
               _context4.next = 17;
               break;
             }
@@ -311,7 +318,7 @@ var XyAuthLayout = function XyAuthLayout(props) {
         }
       }, _callee4, null, [[0, 20]]);
     }));
-    return function getUserinfo() {
+    return function getUserinfo(_x) {
       return _ref4.apply(this, arguments);
     };
   }();
@@ -319,6 +326,7 @@ var XyAuthLayout = function XyAuthLayout(props) {
   // 加载状态
   if (!token) {
     return /*#__PURE__*/_jsx("div", {
+      className: "xyAuthLayoutLoading",
       style: {
         display: 'flex',
         justifyContent: 'center',

package/dist/services/service.js

@@ -24,17 +24,17 @@ function _queryCurrent() {
   }));
   return _queryCurrent.apply(this, arguments);
 }
-export function queryAaaCurrent(_x2) {
+export function queryAaaCurrent(_x2, _x3) {
   return _queryAaaCurrent.apply(this, arguments);
 }
 
 // 退出登录 | aaa
 function _queryAaaCurrent() {
-  _queryAaaCurrent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+  _queryAaaCurrent = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params, options) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", doRequest('/api/aaa/current', 'POST', params));
+          return _context2.abrupt("return", doRequest('/api/aaa/current', 'POST', params, options));
         case 1:
         case "end":
           return _context2.stop();
@@ -43,7 +43,7 @@ function _queryAaaCurrent() {
   }));
   return _queryAaaCurrent.apply(this, arguments);
 }
-export function accountAAALogout(_x3) {
+export function accountAAALogout(_x4) {
   return _accountAAALogout.apply(this, arguments);
 }
 function _accountAAALogout() {

package/dist/utils/request.js

@@ -11,7 +11,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
  * request 网络请求工具
  */
 import { notification, message } from 'antd';
-import { getSessionStorage } from "./token.js";
+import { getSessionStorage, setSessionStorage } from "./token.js";
 import { handleUnauthorized } from "../components";
 
 /* ********************************************************************************************************************************* */
@@ -133,6 +133,7 @@ function _doRequest() {
       token,
       response,
       fetchOptions,
+      _token,
       result,
       rspCode,
       _args2 = arguments;
@@ -177,36 +178,41 @@ function _doRequest() {
           return _context2.abrupt("return", errorHandler(null));
         case 16:
           if (!response.ok) {
-            _context2.next = 30;
+            _context2.next = 32;
             break;
           }
           _context2.prev = 17;
-          _context2.next = 20;
+          // 如果获取用户的接口上有返回token，那么存储token
+          _token = response.headers.get('Authorization');
+          if (response.url.indexOf('/api/aaa/current') && _token) {
+            setSessionStorage('Token', _token);
+          }
+          _context2.next = 22;
           return response.clone().json();
-        case 20:
+        case 22:
           result = _context2.sent;
           rspCode = result.rspCode; // 状态编码只有在已定义的，需要处理的编码里才会返回响应，否则会进入错误回调
           if (!(rspCode && PROCESS_RESPONSE_CODES.includes(rspCode))) {
-            _context2.next = 24;
+            _context2.next = 26;
             break;
           }
           return _context2.abrupt("return", result);
-        case 24:
-          _context2.next = 30;
-          break;
         case 26:
-          _context2.prev = 26;
+          _context2.next = 32;
+          break;
+        case 28:
+          _context2.prev = 28;
           _context2.t1 = _context2["catch"](17);
           // JSON 解析失败，按网络异常处理
           console.error(_context2.t1);
           return _context2.abrupt("return", errorHandler(null));
-        case 30:
+        case 32:
           return _context2.abrupt("return", errorHandler(response));
-        case 31:
+        case 33:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[4, 12], [17, 26]]);
+    }, _callee2, null, [[4, 12], [17, 28]]);
   }));
   return _doRequest.apply(this, arguments);
 }

package/dist/utils/utils.js

@@ -31,15 +31,17 @@ export var asyncCallback = function asyncCallback(res, isTip) {
  * @returns {string|boolean} - 返回查询参数的值，如果不存在则返回 false
  */
 export function getQueryVariable(variable) {
-  var query = window.location.search.substring(1);
+  var parts = window.location.href.split('?');
+  if (parts.length < 2) return null;
+  var query = parts[1];
   var vars = query.split('&');
   for (var i = 0; i < vars.length; i++) {
     var pair = vars[i].split('=');
-    if (pair[0] == variable) {
-      return pair[1];
+    if (decodeURIComponent(pair[0]) === variable) {
+      return decodeURIComponent(pair[1]);
     }
   }
-  return false;
+  return null;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "xydata-tools",
-	"version": "1.1.29",
+	"version": "1.1.30",
 	"description": "xydata tools",
 	"main": "dist/index.js",
 	"module": "dist/index.js",