@nutui/nutui-react-taro 3.0.19-cpp.24 → 3.0.19-cpp.25
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.
- package/dist/cjs/packages/navbar/style/style.css +1 -1
- package/dist/cjs/packages/navbar/style/style.harmony.css +1 -1
- package/dist/cjs/utils/taro/get-system-info.d.ts +3 -0
- package/dist/cjs/utils/taro/get-system-info.js +4 -3
- package/dist/cjs/utils/taro/platform.js +6 -5
- package/dist/cjs/utils/taro/px-transform.js +3 -2
- package/dist/es/packages/navbar/style/style.css +1 -1
- package/dist/es/packages/navbar/style/style.harmony.css +1 -1
- package/dist/es/utils/taro/get-system-info.d.ts +3 -0
- package/dist/es/utils/taro/get-system-info.js +6 -3
- package/dist/es/utils/taro/platform.js +5 -5
- package/dist/es/utils/taro/px-transform.js +2 -2
- package/dist/nutui.react.umd.js +2 -2
- package/dist/style-jmapp.css +1 -1
- package/dist/style-jmapp.scss +35 -35
- package/dist/style-jrkf.css +1 -1
- package/dist/style-jrkf.scss +30 -30
- package/dist/style.css +1 -1
- package/dist/style.scss +36 -36
- package/dist/styles/variables.scss +1 -1
- package/package.json +1 -1
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
height: var(--nutui-navbar-height, 44px);
|
|
13
13
|
box-sizing: border-box;
|
|
14
14
|
background: var(--nutui-navbar-background, #ffffff);
|
|
15
|
-
box-shadow: var(--nutui-navbar-box-shadow,
|
|
15
|
+
box-shadow: var(--nutui-navbar-box-shadow, none);
|
|
16
16
|
font-size: var(--nutui-navbar-font-size, var(--nutui-font-size-base, 14px));
|
|
17
17
|
color: var(--nutui-navbar-color, var(--nutui-color-title, #1a1a1a));
|
|
18
18
|
overflow: hidden;
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
height: var(--nutui-navbar-height, 44px);
|
|
13
13
|
box-sizing: border-box;
|
|
14
14
|
background: var(--nutui-navbar-background, #ffffff);
|
|
15
|
-
box-shadow: var(--nutui-navbar-box-shadow,
|
|
15
|
+
box-shadow: var(--nutui-navbar-box-shadow, none);
|
|
16
16
|
font-size: var(--nutui-navbar-font-size, var(--nutui-font-size-base, 14px));
|
|
17
17
|
color: var(--nutui-navbar-color, var(--nutui-color-title, #1a1a1a));
|
|
18
18
|
overflow: hidden;
|
|
@@ -3,11 +3,14 @@ interface IDeviceInfo extends Omit<Taro.getDeviceInfo.Result, 'deviceAbi' | 'CPU
|
|
|
3
3
|
}
|
|
4
4
|
/**
|
|
5
5
|
* 获取设备基础信息,兼容新旧 API
|
|
6
|
+
* Android&iOS 这边新包提供 getDeviceInfo 的支持,但是鸿蒙短期内不会支持 canIUse,组件库代码可以使用 Taro.getDeviceInfo 然后 Taro
|
|
7
|
+
.getSystemInfo 兜底
|
|
6
8
|
* @returns {IDeviceInfo} 设备基础信息
|
|
7
9
|
*/
|
|
8
10
|
export declare const getDeviceInfo: () => IDeviceInfo;
|
|
9
11
|
/**
|
|
10
12
|
* 获取窗口信息,兼容新旧 API
|
|
13
|
+
* 鸿蒙短期内不会支持 canIUse
|
|
11
14
|
* @returns {Taro.getWindowInfo.Result} 窗口信息
|
|
12
15
|
*/
|
|
13
16
|
export declare const getWindowInfo: () => Taro.getWindowInfo.Result;
|
|
@@ -16,11 +16,12 @@ _export(exports, {
|
|
|
16
16
|
return getWindowInfo;
|
|
17
17
|
}
|
|
18
18
|
});
|
|
19
|
-
var
|
|
19
|
+
var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
20
|
+
var _taro = /*#__PURE__*/ _interop_require_default._(require("@tarojs/taro"));
|
|
20
21
|
var getDeviceInfo = function getDeviceInfo() {
|
|
21
|
-
return
|
|
22
|
+
return typeof _taro.default.getDeviceInfo === 'function' ? _taro.default.getDeviceInfo() : _taro.default.getSystemInfoSync();
|
|
22
23
|
};
|
|
23
24
|
var getWindowInfo = function getWindowInfo() {
|
|
24
|
-
return
|
|
25
|
+
return typeof _taro.default.getWindowInfo === 'function' ? _taro.default.getWindowInfo() : _taro.default.getSystemInfoSync();
|
|
25
26
|
} // /**
|
|
26
27
|
;
|
|
@@ -22,26 +22,27 @@ _export(exports, {
|
|
|
22
22
|
return web;
|
|
23
23
|
}
|
|
24
24
|
});
|
|
25
|
-
var
|
|
25
|
+
var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
26
|
+
var _taro = /*#__PURE__*/ _interop_require_default._(require("@tarojs/taro"));
|
|
26
27
|
var harmony = function harmony() {
|
|
27
28
|
return [
|
|
28
29
|
'harmony',
|
|
29
30
|
'harmonyhybrid',
|
|
30
31
|
'jdharmony'
|
|
31
|
-
].includes(
|
|
32
|
+
].includes(_taro.default.getEnv().toLowerCase());
|
|
32
33
|
};
|
|
33
34
|
var web = function web() {
|
|
34
35
|
return [
|
|
35
36
|
'web'
|
|
36
|
-
].includes(
|
|
37
|
+
].includes(_taro.default.getEnv().toLowerCase());
|
|
37
38
|
};
|
|
38
39
|
var miniprogram = function miniprogram() {
|
|
39
40
|
return [
|
|
40
41
|
'mini'
|
|
41
|
-
].includes(
|
|
42
|
+
].includes(_taro.default.getEnv().toLowerCase());
|
|
42
43
|
};
|
|
43
44
|
var td = function td() {
|
|
44
45
|
return [
|
|
45
46
|
'dynamic'
|
|
46
|
-
].includes(
|
|
47
|
+
].includes(_taro.default.getEnv().toLowerCase());
|
|
47
48
|
};
|
|
@@ -8,10 +8,11 @@ Object.defineProperty(exports, "pxTransform", {
|
|
|
8
8
|
return pxTransform;
|
|
9
9
|
}
|
|
10
10
|
});
|
|
11
|
-
var
|
|
11
|
+
var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
|
|
12
|
+
var _taro = /*#__PURE__*/ _interop_require_default._(require("@tarojs/taro"));
|
|
12
13
|
var _platform = require("./platform");
|
|
13
14
|
function pxTransform(value, radix) {
|
|
14
15
|
// @ts-ignore
|
|
15
|
-
if ((0, _platform.harmony)() || (0, _platform.td)()) return
|
|
16
|
+
if ((0, _platform.harmony)() || (0, _platform.td)()) return _taro.default.pxTransform(value, radix || 375);
|
|
16
17
|
return "".concat(value, "px");
|
|
17
18
|
}
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
height: var(--nutui-navbar-height, 44px);
|
|
13
13
|
box-sizing: border-box;
|
|
14
14
|
background: var(--nutui-navbar-background, #ffffff);
|
|
15
|
-
box-shadow: var(--nutui-navbar-box-shadow,
|
|
15
|
+
box-shadow: var(--nutui-navbar-box-shadow, none);
|
|
16
16
|
font-size: var(--nutui-navbar-font-size, var(--nutui-font-size-base, 14px));
|
|
17
17
|
color: var(--nutui-navbar-color, var(--nutui-color-title, #1a1a1a));
|
|
18
18
|
overflow: hidden;
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
height: var(--nutui-navbar-height, 44px);
|
|
13
13
|
box-sizing: border-box;
|
|
14
14
|
background: var(--nutui-navbar-background, #ffffff);
|
|
15
|
-
box-shadow: var(--nutui-navbar-box-shadow,
|
|
15
|
+
box-shadow: var(--nutui-navbar-box-shadow, none);
|
|
16
16
|
font-size: var(--nutui-navbar-font-size, var(--nutui-font-size-base, 14px));
|
|
17
17
|
color: var(--nutui-navbar-color, var(--nutui-color-title, #1a1a1a));
|
|
18
18
|
overflow: hidden;
|
|
@@ -3,11 +3,14 @@ interface IDeviceInfo extends Omit<Taro.getDeviceInfo.Result, 'deviceAbi' | 'CPU
|
|
|
3
3
|
}
|
|
4
4
|
/**
|
|
5
5
|
* 获取设备基础信息,兼容新旧 API
|
|
6
|
+
* Android&iOS 这边新包提供 getDeviceInfo 的支持,但是鸿蒙短期内不会支持 canIUse,组件库代码可以使用 Taro.getDeviceInfo 然后 Taro
|
|
7
|
+
.getSystemInfo 兜底
|
|
6
8
|
* @returns {IDeviceInfo} 设备基础信息
|
|
7
9
|
*/
|
|
8
10
|
export declare const getDeviceInfo: () => IDeviceInfo;
|
|
9
11
|
/**
|
|
10
12
|
* 获取窗口信息,兼容新旧 API
|
|
13
|
+
* 鸿蒙短期内不会支持 canIUse
|
|
11
14
|
* @returns {Taro.getWindowInfo.Result} 窗口信息
|
|
12
15
|
*/
|
|
13
16
|
export declare const getWindowInfo: () => Taro.getWindowInfo.Result;
|
|
@@ -1,15 +1,18 @@
|
|
|
1
|
-
import
|
|
1
|
+
import Taro from "@tarojs/taro";
|
|
2
2
|
/**
|
|
3
3
|
* 获取设备基础信息,兼容新旧 API
|
|
4
|
+
* Android&iOS 这边新包提供 getDeviceInfo 的支持,但是鸿蒙短期内不会支持 canIUse,组件库代码可以使用 Taro.getDeviceInfo 然后 Taro
|
|
5
|
+
.getSystemInfo 兜底
|
|
4
6
|
* @returns {IDeviceInfo} 设备基础信息
|
|
5
7
|
*/ export var getDeviceInfo = function() {
|
|
6
|
-
return
|
|
8
|
+
return typeof Taro.getDeviceInfo === 'function' ? Taro.getDeviceInfo() : Taro.getSystemInfoSync();
|
|
7
9
|
};
|
|
8
10
|
/**
|
|
9
11
|
* 获取窗口信息,兼容新旧 API
|
|
12
|
+
* 鸿蒙短期内不会支持 canIUse
|
|
10
13
|
* @returns {Taro.getWindowInfo.Result} 窗口信息
|
|
11
14
|
*/ export var getWindowInfo = function() {
|
|
12
|
-
return
|
|
15
|
+
return typeof Taro.getWindowInfo === 'function' ? Taro.getWindowInfo() : Taro.getSystemInfoSync();
|
|
13
16
|
} // /**
|
|
14
17
|
// * 获取应用基础信息,兼容新旧 API
|
|
15
18
|
// * @returns {Taro.getAppBaseInfo.Result} 应用基础信息
|
|
@@ -1,23 +1,23 @@
|
|
|
1
|
-
import
|
|
1
|
+
import Taro from "@tarojs/taro";
|
|
2
2
|
export var harmony = function() {
|
|
3
3
|
return [
|
|
4
4
|
'harmony',
|
|
5
5
|
'harmonyhybrid',
|
|
6
6
|
'jdharmony'
|
|
7
|
-
].includes(getEnv().toLowerCase());
|
|
7
|
+
].includes(Taro.getEnv().toLowerCase());
|
|
8
8
|
};
|
|
9
9
|
export var web = function() {
|
|
10
10
|
return [
|
|
11
11
|
'web'
|
|
12
|
-
].includes(getEnv().toLowerCase());
|
|
12
|
+
].includes(Taro.getEnv().toLowerCase());
|
|
13
13
|
};
|
|
14
14
|
export var miniprogram = function() {
|
|
15
15
|
return [
|
|
16
16
|
'mini'
|
|
17
|
-
].includes(getEnv().toLowerCase());
|
|
17
|
+
].includes(Taro.getEnv().toLowerCase());
|
|
18
18
|
};
|
|
19
19
|
export var td = function() {
|
|
20
20
|
return [
|
|
21
21
|
'dynamic'
|
|
22
|
-
].includes(getEnv().toLowerCase());
|
|
22
|
+
].includes(Taro.getEnv().toLowerCase());
|
|
23
23
|
};
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import Taro from "@tarojs/taro";
|
|
2
2
|
import { harmony, td } from "./platform";
|
|
3
3
|
// td todo
|
|
4
4
|
export function pxTransform(value, radix) {
|
|
5
5
|
// @ts-ignore
|
|
6
|
-
if (harmony() || td()) return
|
|
6
|
+
if (harmony() || td()) return Taro.pxTransform(value, radix || 375);
|
|
7
7
|
return "".concat(value, "px");
|
|
8
8
|
}
|
package/dist/nutui.react.umd.js
CHANGED
|
@@ -2092,10 +2092,10 @@
|
|
|
2092
2092
|
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
|
|
2093
2093
|
};
|
|
2094
2094
|
var getDeviceInfo = function() {
|
|
2095
|
-
return Taro.
|
|
2095
|
+
return typeof Taro.getDeviceInfo === "function" ? Taro.getDeviceInfo() : Taro.getSystemInfoSync();
|
|
2096
2096
|
};
|
|
2097
2097
|
var getWindowInfo = function() {
|
|
2098
|
-
return Taro.
|
|
2098
|
+
return typeof Taro.getWindowInfo === "function" ? Taro.getWindowInfo() : Taro.getSystemInfoSync();
|
|
2099
2099
|
};
|
|
2100
2100
|
function useWatch$1(dep, callback) {
|
|
2101
2101
|
var config2 = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : {
|