@smart100/spu-web-plugin 1.0.27 → 1.0.28

package/dist/spu-web-plugin.mjs

@@ -1,4 +1,4 @@
-var version = "1.0.27";
+var version = "1.0.28";
 
 /** Detect free variable `global` from Node.js. */
 var freeGlobal$2 = typeof global == 'object' && global && global.Object === Object && global;
@@ -20217,11 +20217,7 @@ function _singleLogin() {
           cacheUser = getUserByToken(getToken()); // 如果本地已经登录
           if (checkLogin()) {
             // 产品运营中心单点登录只有 token
-            if (loginRole === 'center') {
-              if ((curUser === null || curUser === void 0 ? void 0 : curUser.userCode) === (cacheUser === null || cacheUser === void 0 ? void 0 : cacheUser.userCode) && (curUser === null || curUser === void 0 ? void 0 : curUser.appId) === (cacheUser === null || cacheUser === void 0 ? void 0 : cacheUser.appId) && (curUser === null || curUser === void 0 ? void 0 : curUser.tenantCode) === (cacheUser === null || cacheUser === void 0 ? void 0 : cacheUser.tenantCode) && (curUser === null || curUser === void 0 ? void 0 : curUser.tokenId) === (cacheUser === null || cacheUser === void 0 ? void 0 : cacheUser.tokenId) && (curUser === null || curUser === void 0 ? void 0 : curUser.envid) === (cacheUser === null || cacheUser === void 0 ? void 0 : cacheUser.envid) && (curUser === null || curUser === void 0 ? void 0 : curUser.productCode) === (cacheUser === null || cacheUser === void 0 ? void 0 : cacheUser.productCode)) {
-                isneedlogin = false;
-              }
-            } else {
+            if (loginRole === 'center') ; else {
               // 不重复走单点登录的逻辑
               // 旧：判断当前单点登录的 token/refreshtoken/tokenexpires 是否与本地缓存的一致
               // 新：解析当前单点登录 token 中的 mbcode、tenantcode，如果与缓存的一致，说明本次登录与上次登录是同个人同个租户
@@ -62657,7 +62653,7 @@ var upload = /*#__PURE__*/function () {
           tenantCode = getUser('tenantcode');
           suffix = '.' + file.name.substring(file.name.lastIndexOf('.') + 1);
           source = source ? source : v4() + suffix;
-          datetime = datetime ? datetime : Date.now();
+          datetime = datetime ? "".concat(datetime) : "".concat(Date.now());
           date = dayjs(+datetime).format('YYYYMMDD');
           osskey = "".concat(source.slice(0, 3), "/").concat(type, "/").concat(date, "/").concat(tenantCode, "/").concat(source); // console.log(file)
           // console.log(source)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smart100/spu-web-plugin",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "description": "",
   "scripts": {
     "dev": "npm run build:types && rollup -c -w",

package/src/login.ts

@@ -639,16 +639,17 @@ async function singleLogin(query: IAny) {
     if (checkLogin()) {
       // 产品运营中心单点登录只有 token
       if (loginRole === 'center') {
-        if (
-          curUser?.userCode === cacheUser?.userCode &&
-          curUser?.appId === cacheUser?.appId &&
-          curUser?.tenantCode === cacheUser?.tenantCode &&
-          curUser?.tokenId === cacheUser?.tokenId &&
-          curUser?.envid === cacheUser?.envid &&
-          curUser?.productCode === cacheUser?.productCode
-        ) {
-          isneedlogin = false
-        }
+        // 产品运营中心每次都需要走单点登录逻辑
+        // if (
+        //   curUser?.userCode === cacheUser?.userCode &&
+        //   curUser?.appId === cacheUser?.appId &&
+        //   curUser?.tenantCode === cacheUser?.tenantCode &&
+        //   curUser?.tokenId === cacheUser?.tokenId &&
+        //   curUser?.envid === cacheUser?.envid &&
+        //   curUser?.productCode === cacheUser?.productCode
+        // ) {
+        //   isneedlogin = false
+        // }
       } else {
         // 不重复走单点登录的逻辑
         // 旧：判断当前单点登录的 token/refreshtoken/tokenexpires 是否与本地缓存的一致

package/src/oss/uploadService.ts

@@ -36,7 +36,7 @@ const upload = async ({
   const tenantCode = getUser('tenantcode')
   const suffix = '.' + file.name.substring(file.name.lastIndexOf('.') + 1)
   source = source ? source : uuidv4() + suffix
-  datetime = datetime ? datetime : Date.now()
+  datetime = datetime ? `${datetime}` : `${Date.now()}`
   const date = dayjs(+datetime).format('YYYYMMDD')
   const osskey = `${source.slice(0, 3)}/${type}/${date}/${tenantCode}/${source}`