component-shipinlv 2.3.3 → 2.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import AccountManageSettingConfig from "../lib/accountManageSettingConfig";
|
|
2
2
|
var isInstalledChrome = function isInstalledChrome() {
|
|
3
3
|
var settingConfig = AccountManageSettingConfig();
|
|
4
|
-
return !!settingConfig.chromePath;
|
|
4
|
+
return false; // !! settingConfig.chromePath;
|
|
5
5
|
};
|
|
6
|
+
|
|
6
7
|
export default isInstalledChrome;
|
|
@@ -8,9 +8,6 @@ var AccountManageSettingConfig = function AccountManageSettingConfig(data) {
|
|
|
8
8
|
return data;
|
|
9
9
|
}
|
|
10
10
|
var chromePath = ((_window$getBridge = (_window = window).getBridge) === null || _window$getBridge === void 0 || (_window$getBridge = _window$getBridge.call(_window)) === null || _window$getBridge === void 0 || (_window$getBridge$get = _window$getBridge.getChromiumPath) === null || _window$getBridge$get === void 0 ? void 0 : _window$getBridge$get.call(_window$getBridge)) || '';
|
|
11
|
-
|
|
12
|
-
// console.log('AccountManageSettingConfig get:', chromePath );
|
|
13
|
-
|
|
14
11
|
var storeData = store.get(AccountManageSettingConfigKey);
|
|
15
12
|
var outData = _objectSpread(_objectSpread({
|
|
16
13
|
isChromeOpen: false,
|
|
@@ -18,7 +15,7 @@ var AccountManageSettingConfig = function AccountManageSettingConfig(data) {
|
|
|
18
15
|
sendMessageToPort: 9514
|
|
19
16
|
}, storeData), {}, {
|
|
20
17
|
// 优先用存储的；
|
|
21
|
-
chromePath:
|
|
18
|
+
chromePath: chromePath
|
|
22
19
|
});
|
|
23
20
|
return outData;
|
|
24
21
|
};
|
package/dist/lib/openChrome.js
CHANGED
|
@@ -25,13 +25,14 @@ var openChrome = /*#__PURE__*/function () {
|
|
|
25
25
|
if (!query.chromePath) {
|
|
26
26
|
query.chromePath = settingConfig.chromePath;
|
|
27
27
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
28
|
+
|
|
29
|
+
// if( ! query.chromePath ){
|
|
30
|
+
// notification.notificationError(
|
|
31
|
+
// '没找到 Google 浏览器',
|
|
32
|
+
// '请设置 谷歌浏览器地址，或者重新安装 https://google.cn/chrome/',
|
|
33
|
+
// );
|
|
34
|
+
// return;
|
|
35
|
+
// }
|
|
35
36
|
return _context3.abrupt("return", new Promise( /*#__PURE__*/function () {
|
|
36
37
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(resolve, reject) {
|
|
37
38
|
var data, cmdResult;
|
|
@@ -140,7 +141,7 @@ var openChrome = /*#__PURE__*/function () {
|
|
|
140
141
|
return _ref2.apply(this, arguments);
|
|
141
142
|
};
|
|
142
143
|
}()));
|
|
143
|
-
case
|
|
144
|
+
case 3:
|
|
144
145
|
case "end":
|
|
145
146
|
return _context3.stop();
|
|
146
147
|
}
|