component-shipinlv 2.0.15 → 2.0.17

package/dist/lib/Tool.d.ts

@@ -162,7 +162,7 @@ declare const Tool: {
     getTitleByPath(path: string): string;
     getDirByPath(path: string): string;
     h5Pay(query: Pay.H5PayQuery): void;
-    notification(type: "info" | "error" | "success" | "warning", message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
+    notification(type: "success" | "info" | "warning" | "error", message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationSuccess(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationError(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;
     notificationWarning(message: string, description?: import("react").ReactNode, options?: NotificationOptions): void;

package/dist/lib/Tool.js

@@ -1100,7 +1100,6 @@ var Tool = _objectSpread(_objectSpread({
     return Date.now() - Tool.getTimeOffset();
   },
   getOsName: function getOsName() {
-    return 'windows';
     var userAgent = navigator.userAgent || window.opera;
 
     // Windows
@@ -1108,7 +1107,8 @@ var Tool = _objectSpread(_objectSpread({
       return "windows";
     }
     // macOS
-    if (/mac/i.test(userAgent)) {
+    // Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36
+    if (/Mac\s/i.test(userAgent)) {
       return "darwin";
     }
 

package/dist/lib/openChrome.js

@@ -170,7 +170,7 @@ var getOpenQuery = /*#__PURE__*/function () {
           });
           chromeProfileDir = settingConfig.chromeUserDataDir + '/' + query.chromeProfileName;
           _context4.t0 = Tool.getOsName();
-          _context4.next = _context4.t0 === "windows" ? 8 : _context4.t0 === "darwin" ? 11 : 16;
+          _context4.next = _context4.t0 === "windows" ? 8 : _context4.t0 === "darwin" ? 11 : 15;
           break;
         case 8:
           // 艹，屎一样的 windows cmd
@@ -188,23 +188,24 @@ var getOpenQuery = /*#__PURE__*/function () {
             // --disable-gpu是为了解决一些在无头模式下可能出现的GPU相关的问题
             cmdList.push("--disable-gpu");
           }
-          return _context4.abrupt("break", 17);
+          return _context4.abrupt("break", 16);
         case 11:
-          cmdList = ["open"];
+          // cmdList = [ `open`, `-a` ];
+
+          cmdList = ["".concat(query.chromePath || 'Google Chrome'), "--args"];
           if (isNew) {
             cmdList.push("-n");
           }
-          cmdList.push("-a", "".concat(query.chromePath || 'Google Chrome'), "--args");
           if (!query.isOpen) {
             cmdList.push("--headless");
 
             // --disable-gpu是为了解决一些在无头模式下可能出现的GPU相关的问题
             cmdList.push("--disable-gpu");
           }
-          return _context4.abrupt("break", 17);
-        case 16:
+          return _context4.abrupt("break", 16);
+        case 15:
           notification.notificationError('不支持的系统', '发布不支持此系统');
-        case 17:
+        case 16:
           position = {
             x: 0,
             y: 0
@@ -222,18 +223,18 @@ var getOpenQuery = /*#__PURE__*/function () {
 
           // 不要检查
           cmdList.push('--no-first-run', '--no-default-browser-check', '--disable-default-apps');
-          _context4.next = 26;
+          _context4.next = 25;
           return getPublishExtensionDir(env).catch(function (err) {
             notification.notificationError('获取插件地址失败', err.message);
           });
-        case 26:
+        case 25:
           publishExtensionDir = _context4.sent;
           if (publishExtensionDir) {
-            _context4.next = 29;
+            _context4.next = 28;
             break;
           }
           return _context4.abrupt("return", Promise.reject(new Error('获取插件地址失败')));
-        case 29:
+        case 28:
           cmdList.push("--load-extension=".concat(publishExtensionDir));
           cmdList.push("".concat(openUrl));
           console.log('profileName:', cmdList, chromeProfileDir);
@@ -241,7 +242,7 @@ var getOpenQuery = /*#__PURE__*/function () {
             commandList: cmdList,
             chromeProfileDir: chromeProfileDir
           });
-        case 33:
+        case 32:
         case "end":
           return _context4.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-shipinlv",
-  "version": "2.0.15",
+  "version": "2.0.17",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",