@nutui/nutui-react-taro 3.0.0 → 3.0.2
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/CHANGELOG.md +24 -0
- package/dist/cjs/hooks/use-client-rect.js +1 -0
- package/dist/cjs/packages/actionsheet/style/style.css +12 -0
- package/dist/cjs/packages/address/style/style.css +12 -0
- package/dist/cjs/packages/calendar/style/style.css +12 -0
- package/dist/cjs/packages/cascader/style/style.css +12 -0
- package/dist/cjs/packages/configprovider/types.d.ts +1 -1
- package/dist/cjs/packages/datepicker/datepicker.js +8 -6
- package/dist/cjs/packages/datepicker/style/style.css +82 -0
- package/dist/cjs/packages/datepickerview/datepickerview.d.ts +3 -0
- package/dist/cjs/packages/datepickerview/datepickerview.js +119 -0
- package/dist/cjs/packages/datepickerview/index.d.ts +3 -0
- package/dist/cjs/packages/{subsidenavbar → datepickerview}/index.js +2 -2
- package/dist/cjs/packages/datepickerview/style/datepickerview.scss +4 -0
- package/dist/cjs/packages/datepickerview/style/index.js +2 -0
- package/dist/cjs/packages/datepickerview/style/style.css +78 -0
- package/dist/cjs/packages/datepickerview/style/style.harmony.css +8 -0
- package/dist/cjs/packages/datepickerview/types.d.ts +15 -0
- package/dist/cjs/packages/datepickerview/types.js +4 -0
- package/dist/cjs/packages/dialog/dialog.js +8 -3
- package/dist/cjs/packages/dialog/style/dialog.scss +0 -1
- package/dist/cjs/packages/dialog/style/style.css +0 -1
- package/dist/cjs/packages/dialog/style/style.harmony.css +0 -1
- package/dist/cjs/packages/drag/drag.js +33 -39
- package/dist/cjs/packages/drag/style/drag.scss +1 -0
- package/dist/cjs/packages/drag/style/style.css +1 -0
- package/dist/cjs/packages/drag/style/style.harmony.css +1 -0
- package/dist/cjs/packages/fixednav/fixednav.js +20 -14
- package/dist/cjs/packages/fixednav/style/fixednav.scss +0 -15
- package/dist/cjs/packages/fixednav/style/style.css +0 -14
- package/dist/cjs/packages/fixednav/style/style.harmony.css +0 -14
- package/dist/cjs/packages/form/form.d.ts +2 -0
- package/dist/cjs/packages/form/form.js +11 -2
- package/dist/cjs/packages/form/index.d.ts +2 -1
- package/dist/cjs/packages/form/index.js +1 -0
- package/dist/cjs/packages/form/style/form.scss +0 -66
- package/dist/cjs/packages/form/style/style.css +31 -21
- package/dist/cjs/packages/form/style/style.harmony.css +1 -67
- package/dist/cjs/packages/form/types.d.ts +2 -1
- package/dist/cjs/packages/form/useform.d.ts +2 -1
- package/dist/cjs/packages/form/useform.js +338 -247
- package/dist/cjs/packages/formitem/formitem.d.ts +1 -0
- package/dist/cjs/packages/formitem/formitem.js +57 -45
- package/dist/cjs/packages/formitem/style/formitem.scss +101 -21
- package/dist/cjs/packages/formitem/style/style.css +89 -12
- package/dist/cjs/packages/formitem/style/style.harmony.css +89 -12
- package/dist/cjs/packages/imagepreview/style/style.css +12 -0
- package/dist/cjs/packages/input/input.js +5 -2
- package/dist/cjs/packages/input/style/input.scss +6 -4
- package/dist/cjs/packages/input/style/style.css +4 -0
- package/dist/cjs/packages/input/style/style.harmony.css +8 -0
- package/dist/cjs/packages/numberkeyboard/style/style.css +12 -0
- package/dist/cjs/packages/nutui.react.build.d.ts +11 -15
- package/dist/cjs/packages/nutui.react.build.js +172 -180
- package/dist/cjs/packages/nutui.react.d.ts +16 -22
- package/dist/cjs/packages/nutui.react.js +177 -187
- package/dist/cjs/packages/nutui.react.scss.d.ts +5 -7
- package/dist/cjs/packages/nutui.react.scss.js +5 -7
- package/dist/cjs/packages/overlay/overlay.js +4 -5
- package/dist/cjs/packages/overlay/style/overlay.scss +0 -4
- package/dist/cjs/packages/picker/style/index.js +1 -0
- package/dist/cjs/packages/picker/style/style.css +82 -0
- package/dist/cjs/packages/popover/style/style.css +12 -0
- package/dist/cjs/packages/popup/popup.js +17 -11
- package/dist/cjs/packages/popup/style/popup.scss +12 -4
- package/dist/cjs/packages/popup/style/style.css +12 -0
- package/dist/cjs/packages/popup/style/style.harmony.css +12 -0
- package/dist/cjs/packages/shortpassword/shortpassword.js +5 -7
- package/dist/cjs/packages/shortpassword/style/shortpassword.scss +10 -0
- package/dist/cjs/packages/shortpassword/style/style.css +21 -0
- package/dist/cjs/packages/shortpassword/style/style.harmony.css +9 -0
- package/dist/cjs/packages/signature/signature.js +1 -1
- package/dist/cjs/packages/swipe/style/style.css +3 -3
- package/dist/cjs/packages/swipe/style/style.harmony.css +3 -3
- package/dist/cjs/packages/swipe/style/swipe.scss +7 -3
- package/dist/cjs/packages/swipe/swipe.js +14 -15
- package/dist/cjs/packages/tabbar/style/style.css +6 -0
- package/dist/cjs/packages/tabbaritem/style/style.css +6 -0
- package/dist/cjs/packages/tabbaritem/style/style.harmony.css +6 -0
- package/dist/cjs/packages/tabbaritem/style/tabbaritem.scss +6 -0
- package/dist/cjs/packages/tabs/tabs.js +6 -13
- package/dist/cjs/packages/textarea/textarea.js +1 -1
- package/dist/cjs/packages/timeselect/style/style.css +12 -0
- package/dist/cjs/packages/tour/style/style.css +12 -0
- package/dist/cjs/utils/get-rect-by-taro.d.ts +1 -1
- package/dist/cjs/utils/get-rect-by-taro.js +4 -1
- package/dist/cjs/utils/get-system-info.js +4 -5
- package/dist/cjs/utils/merge.d.ts +14 -0
- package/dist/cjs/utils/merge.js +98 -0
- package/dist/cjs/utils/platform-taro.js +4 -5
- package/dist/cjs/utils/to-array.d.ts +1 -0
- package/dist/cjs/utils/to-array.js +18 -0
- package/dist/es/hooks/use-client-rect.js +1 -0
- package/dist/es/packages/actionsheet/style/style.css +12 -0
- package/dist/es/packages/address/style/style.css +12 -0
- package/dist/es/packages/calendar/style/style.css +12 -0
- package/dist/es/packages/cascader/style/style.css +12 -0
- package/dist/es/packages/configprovider/types.d.ts +1 -1
- package/dist/es/packages/datepicker/datepicker.js +8 -6
- package/dist/es/packages/datepicker/style/style.css +82 -0
- package/dist/es/packages/datepickerview/datepickerview.d.ts +3 -0
- package/dist/es/packages/datepickerview/datepickerview.js +107 -0
- package/dist/es/packages/datepickerview/index.d.ts +3 -0
- package/dist/es/packages/datepickerview/index.js +2 -0
- package/dist/es/packages/datepickerview/style/datepickerview.scss +4 -0
- package/dist/es/packages/datepickerview/style/index.js +2 -0
- package/dist/es/packages/datepickerview/style/style.css +78 -0
- package/dist/es/packages/datepickerview/style/style.harmony.css +8 -0
- package/dist/es/packages/datepickerview/types.d.ts +15 -0
- package/dist/es/packages/datepickerview/types.js +1 -0
- package/dist/es/packages/dialog/dialog.js +8 -3
- package/dist/es/packages/dialog/style/dialog.scss +0 -1
- package/dist/es/packages/dialog/style/style.css +0 -1
- package/dist/es/packages/dialog/style/style.harmony.css +0 -1
- package/dist/es/packages/drag/drag.js +33 -39
- package/dist/es/packages/drag/style/drag.scss +1 -0
- package/dist/es/packages/drag/style/style.css +1 -0
- package/dist/es/packages/drag/style/style.harmony.css +1 -0
- package/dist/es/packages/fixednav/fixednav.js +20 -14
- package/dist/es/packages/fixednav/style/fixednav.scss +0 -15
- package/dist/es/packages/fixednav/style/style.css +0 -14
- package/dist/es/packages/fixednav/style/style.harmony.css +0 -14
- package/dist/es/packages/form/form.d.ts +10 -0
- package/dist/es/packages/form/form.js +11 -2
- package/dist/es/packages/form/index.d.ts +2 -1
- package/dist/es/packages/form/index.js +2 -1
- package/dist/es/packages/form/style/form.scss +0 -66
- package/dist/es/packages/form/style/style.css +31 -21
- package/dist/es/packages/form/style/style.harmony.css +1 -67
- package/dist/es/packages/form/types.d.ts +2 -1
- package/dist/es/packages/form/useform.d.ts +2 -1
- package/dist/es/packages/form/useform.js +336 -248
- package/dist/es/packages/formitem/formitem.d.ts +1 -0
- package/dist/es/packages/formitem/formitem.js +58 -46
- package/dist/es/packages/formitem/style/formitem.scss +101 -21
- package/dist/es/packages/formitem/style/style.css +89 -12
- package/dist/es/packages/formitem/style/style.harmony.css +89 -12
- package/dist/es/packages/imagepreview/style/style.css +12 -0
- package/dist/es/packages/input/input.js +5 -2
- package/dist/es/packages/input/style/input.scss +6 -4
- package/dist/es/packages/input/style/style.css +4 -0
- package/dist/es/packages/input/style/style.harmony.css +8 -0
- package/dist/es/packages/numberkeyboard/style/style.css +12 -0
- package/dist/es/packages/nutui.react.build.d.ts +11 -15
- package/dist/es/packages/nutui.react.build.js +11 -15
- package/dist/es/packages/overlay/overlay.js +4 -5
- package/dist/es/packages/overlay/style/overlay.scss +0 -4
- package/dist/es/packages/picker/style/index.js +1 -0
- package/dist/es/packages/picker/style/style.css +82 -0
- package/dist/es/packages/popover/style/style.css +12 -0
- package/dist/es/packages/popup/popup.js +17 -11
- package/dist/es/packages/popup/style/popup.scss +12 -4
- package/dist/es/packages/popup/style/style.css +12 -0
- package/dist/es/packages/popup/style/style.harmony.css +12 -0
- package/dist/es/packages/shortpassword/shortpassword.js +5 -7
- package/dist/es/packages/shortpassword/style/shortpassword.scss +10 -0
- package/dist/es/packages/shortpassword/style/style.css +21 -0
- package/dist/es/packages/shortpassword/style/style.harmony.css +9 -0
- package/dist/es/packages/signature/signature.js +2 -2
- package/dist/es/packages/swipe/style/style.css +3 -3
- package/dist/es/packages/swipe/style/style.harmony.css +3 -3
- package/dist/es/packages/swipe/style/swipe.scss +7 -3
- package/dist/es/packages/swipe/swipe.js +14 -15
- package/dist/es/packages/tabbar/style/style.css +6 -0
- package/dist/es/packages/tabbaritem/style/style.css +6 -0
- package/dist/es/packages/tabbaritem/style/style.harmony.css +6 -0
- package/dist/es/packages/tabbaritem/style/tabbaritem.scss +6 -0
- package/dist/es/packages/tabs/tabs.js +6 -13
- package/dist/es/packages/textarea/textarea.js +2 -2
- package/dist/es/packages/timeselect/style/style.css +12 -0
- package/dist/es/packages/tour/style/style.css +12 -0
- package/dist/es/utils/get-rect-by-taro.d.ts +1 -1
- package/dist/es/utils/get-rect-by-taro.js +4 -1
- package/dist/es/utils/get-system-info.js +4 -4
- package/dist/es/utils/merge.d.ts +14 -0
- package/dist/es/utils/merge.js +68 -0
- package/dist/es/utils/platform-taro.js +4 -4
- package/dist/es/utils/to-array.d.ts +1 -0
- package/dist/es/utils/to-array.js +8 -0
- package/dist/nutui.react.umd.js +5593 -5442
- package/dist/style.css +1 -1
- package/dist/style.scss +34 -36
- package/dist/styles/variables-jmapp.scss +0 -50
- package/dist/styles/variables-jrkf.scss +0 -50
- package/dist/styles/variables.scss +0 -49
- package/package.json +1 -1
- package/dist/cjs/packages/sidenavbar/context.d.ts +0 -1
- package/dist/cjs/packages/sidenavbar/context.js +0 -12
- package/dist/cjs/packages/sidenavbar/index.d.ts +0 -3
- package/dist/cjs/packages/sidenavbar/index.js +0 -12
- package/dist/cjs/packages/sidenavbar/sidenavbar.d.ts +0 -14
- package/dist/cjs/packages/sidenavbar/sidenavbar.js +0 -75
- package/dist/cjs/packages/sidenavbar/style/index.js +0 -2
- package/dist/cjs/packages/sidenavbar/style/sidenavbar.scss +0 -89
- package/dist/cjs/packages/sidenavbar/style/style.css +0 -443
- package/dist/cjs/packages/sidenavbar/style/style.harmony.css +0 -74
- package/dist/cjs/packages/sidenavbar/utils.d.ts +0 -3
- package/dist/cjs/packages/sidenavbar/utils.js +0 -23
- package/dist/cjs/packages/sidenavbaritem/index.d.ts +0 -3
- package/dist/cjs/packages/sidenavbaritem/index.js +0 -12
- package/dist/cjs/packages/sidenavbaritem/sidenavbaritem.d.ts +0 -11
- package/dist/cjs/packages/sidenavbaritem/sidenavbaritem.js +0 -34
- package/dist/cjs/packages/sidenavbaritem/style/index.js +0 -1
- package/dist/cjs/packages/sidenavbaritem/style/sidenavbaritem.scss +0 -13
- package/dist/cjs/packages/sidenavbaritem/style/style.css +0 -14
- package/dist/cjs/packages/sidenavbaritem/style/style.harmony.css +0 -14
- package/dist/cjs/packages/subsidenavbar/index.d.ts +0 -3
- package/dist/cjs/packages/subsidenavbar/style/css.js +0 -1
- package/dist/cjs/packages/subsidenavbar/style/index.js +0 -1
- package/dist/cjs/packages/subsidenavbar/style/style.css +0 -20
- package/dist/cjs/packages/subsidenavbar/style/style.harmony.css +0 -20
- package/dist/cjs/packages/subsidenavbar/style/subsidenavbar.scss +0 -26
- package/dist/cjs/packages/subsidenavbar/subsidenavbar.d.ts +0 -13
- package/dist/cjs/packages/subsidenavbar/subsidenavbar.js +0 -90
- package/dist/es/packages/sidenavbar/context.d.ts +0 -1
- package/dist/es/packages/sidenavbar/context.js +0 -2
- package/dist/es/packages/sidenavbar/index.d.ts +0 -3
- package/dist/es/packages/sidenavbar/index.js +0 -2
- package/dist/es/packages/sidenavbar/sidenavbar.d.ts +0 -38
- package/dist/es/packages/sidenavbar/sidenavbar.js +0 -63
- package/dist/es/packages/sidenavbar/style/css.js +0 -1
- package/dist/es/packages/sidenavbar/style/index.js +0 -2
- package/dist/es/packages/sidenavbar/style/sidenavbar.scss +0 -89
- package/dist/es/packages/sidenavbar/style/style.css +0 -443
- package/dist/es/packages/sidenavbar/style/style.harmony.css +0 -74
- package/dist/es/packages/sidenavbar/utils.d.ts +0 -3
- package/dist/es/packages/sidenavbar/utils.js +0 -14
- package/dist/es/packages/sidenavbaritem/index.d.ts +0 -3
- package/dist/es/packages/sidenavbaritem/index.js +0 -2
- package/dist/es/packages/sidenavbaritem/sidenavbaritem.d.ts +0 -11
- package/dist/es/packages/sidenavbaritem/sidenavbaritem.js +0 -23
- package/dist/es/packages/sidenavbaritem/style/css.js +0 -1
- package/dist/es/packages/sidenavbaritem/style/index.js +0 -1
- package/dist/es/packages/sidenavbaritem/style/sidenavbaritem.scss +0 -13
- package/dist/es/packages/sidenavbaritem/style/style.css +0 -14
- package/dist/es/packages/sidenavbaritem/style/style.harmony.css +0 -14
- package/dist/es/packages/subsidenavbar/index.d.ts +0 -3
- package/dist/es/packages/subsidenavbar/index.js +0 -2
- package/dist/es/packages/subsidenavbar/style/css.js +0 -1
- package/dist/es/packages/subsidenavbar/style/index.js +0 -1
- package/dist/es/packages/subsidenavbar/style/style.css +0 -20
- package/dist/es/packages/subsidenavbar/style/style.harmony.css +0 -20
- package/dist/es/packages/subsidenavbar/style/subsidenavbar.scss +0 -26
- package/dist/es/packages/subsidenavbar/subsidenavbar.d.ts +0 -13
- package/dist/es/packages/subsidenavbar/subsidenavbar.js +0 -79
- /package/dist/cjs/packages/{sidenavbar → datepickerview}/style/css.js +0 -0
- /package/dist/{cjs/packages/sidenavbaritem → es/packages/datepickerview}/style/css.js +0 -0
|
@@ -9,4 +9,4 @@ export interface Rect {
|
|
|
9
9
|
height: number;
|
|
10
10
|
}
|
|
11
11
|
export declare function makeRect(width: number, height: number): Rect;
|
|
12
|
-
export declare const getRectByTaro: (element: any) => Promise<Rect>;
|
|
12
|
+
export declare const getRectByTaro: (element: any, harmonyId?: string) => Promise<Rect>;
|
|
@@ -15,7 +15,10 @@ export function makeRect(width, height) {
|
|
|
15
15
|
}
|
|
16
16
|
export var getRectByTaro = /*#__PURE__*/ function() {
|
|
17
17
|
var _ref = _async_to_generator(function(element) {
|
|
18
|
+
var harmonyId;
|
|
19
|
+
var _arguments = arguments;
|
|
18
20
|
return _ts_generator(this, function(_state) {
|
|
21
|
+
harmonyId = _arguments.length > 1 && _arguments[1] !== void 0 ? _arguments[1] : '';
|
|
19
22
|
if (element) {
|
|
20
23
|
if (inBrowser) {
|
|
21
24
|
return [
|
|
@@ -27,7 +30,7 @@ export var getRectByTaro = /*#__PURE__*/ function() {
|
|
|
27
30
|
return [
|
|
28
31
|
2,
|
|
29
32
|
new Promise(function(resolve, reject) {
|
|
30
|
-
createSelectorQuery().select("#".concat(element.uid)).boundingClientRect().exec(function(param) {
|
|
33
|
+
createSelectorQuery().select("#".concat(harmonyId || element.uid)).boundingClientRect().exec(function(param) {
|
|
31
34
|
var _param = _sliced_to_array(param, 1), rects = _param[0];
|
|
32
35
|
resolve(rects);
|
|
33
36
|
});
|
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { canIUse, getAppBaseInfo as taroGetAppBaseInfo, getDeviceInfo as taroGetDeviceInfo, getSystemInfoSync, getWindowInfo as taroGetWindowInfo } from "@tarojs/taro";
|
|
2
2
|
/**
|
|
3
3
|
* 获取设备基础信息,兼容新旧 API
|
|
4
4
|
* @returns {IDeviceInfo} 设备基础信息
|
|
5
5
|
*/ export var getDeviceInfo = function() {
|
|
6
|
-
return
|
|
6
|
+
return canIUse('getDeviceInfo') ? taroGetDeviceInfo() : getSystemInfoSync();
|
|
7
7
|
};
|
|
8
8
|
/**
|
|
9
9
|
* 获取窗口信息,兼容新旧 API
|
|
10
10
|
* @returns {Taro.getWindowInfo.Result} 窗口信息
|
|
11
11
|
*/ export var getWindowInfo = function() {
|
|
12
|
-
return
|
|
12
|
+
return canIUse('getWindowInfo') ? taroGetWindowInfo() : getSystemInfoSync();
|
|
13
13
|
};
|
|
14
14
|
/**
|
|
15
15
|
* 获取应用基础信息,兼容新旧 API
|
|
16
16
|
* @returns {Taro.getAppBaseInfo.Result} 应用基础信息
|
|
17
17
|
*/ export var getAppBaseInfo = function() {
|
|
18
|
-
return
|
|
18
|
+
return canIUse('getAppBaseInfo') ? taroGetAppBaseInfo() : getSystemInfoSync();
|
|
19
19
|
};
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
export default main;
|
|
2
|
+
export declare function main(clone: boolean, ...items: any[]): any;
|
|
3
|
+
export declare function main(...items: any[]): any;
|
|
4
|
+
export declare namespace main {
|
|
5
|
+
var clone: typeof import("./merge").clone;
|
|
6
|
+
var isPlainObject: typeof import("./merge").isPlainObject;
|
|
7
|
+
var recursive: typeof import("./merge").recursive;
|
|
8
|
+
}
|
|
9
|
+
export declare function merge(clone: boolean, ...items: any[]): any;
|
|
10
|
+
export declare function merge(...items: any[]): any;
|
|
11
|
+
export declare function recursive(clone: boolean, ...items: any[]): any;
|
|
12
|
+
export declare function recursive(...items: any[]): any;
|
|
13
|
+
export declare function clone<T>(input: T): T;
|
|
14
|
+
export declare function isPlainObject(input: unknown): input is NonNullable<any>;
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
|
|
2
|
+
import { _ as _type_of } from "@swc/helpers/_/_type_of";
|
|
3
|
+
export default main;
|
|
4
|
+
export function main() {
|
|
5
|
+
for(var _len = arguments.length, items = new Array(_len), _key = 0; _key < _len; _key++){
|
|
6
|
+
items[_key] = arguments[_key];
|
|
7
|
+
}
|
|
8
|
+
return merge.apply(void 0, _to_consumable_array(items));
|
|
9
|
+
}
|
|
10
|
+
main.clone = clone;
|
|
11
|
+
main.isPlainObject = isPlainObject;
|
|
12
|
+
main.recursive = recursive;
|
|
13
|
+
export function merge() {
|
|
14
|
+
for(var _len = arguments.length, items = new Array(_len), _key = 0; _key < _len; _key++){
|
|
15
|
+
items[_key] = arguments[_key];
|
|
16
|
+
}
|
|
17
|
+
return _merge(items[0] === true, false, items);
|
|
18
|
+
}
|
|
19
|
+
export function recursive() {
|
|
20
|
+
for(var _len = arguments.length, items = new Array(_len), _key = 0; _key < _len; _key++){
|
|
21
|
+
items[_key] = arguments[_key];
|
|
22
|
+
}
|
|
23
|
+
return _merge(items[0] === true, true, items);
|
|
24
|
+
}
|
|
25
|
+
export function clone(input) {
|
|
26
|
+
if (Array.isArray(input)) {
|
|
27
|
+
var output = [];
|
|
28
|
+
for(var index = 0; index < input.length; ++index)output.push(clone(input[index]));
|
|
29
|
+
return output;
|
|
30
|
+
}
|
|
31
|
+
if (isPlainObject(input)) {
|
|
32
|
+
var output1 = {};
|
|
33
|
+
// eslint-disable-next-line guard-for-in
|
|
34
|
+
for(var index1 in input)output1[index1] = clone(input[index1]);
|
|
35
|
+
return output1;
|
|
36
|
+
}
|
|
37
|
+
return input;
|
|
38
|
+
}
|
|
39
|
+
export function isPlainObject(input) {
|
|
40
|
+
if (input === null || (typeof input === "undefined" ? "undefined" : _type_of(input)) !== 'object') return false;
|
|
41
|
+
if (Object.getPrototypeOf(input) === null) return true;
|
|
42
|
+
var ref = input;
|
|
43
|
+
while(Object.getPrototypeOf(ref) !== null)ref = Object.getPrototypeOf(ref);
|
|
44
|
+
return Object.getPrototypeOf(input) === ref;
|
|
45
|
+
}
|
|
46
|
+
function _recursiveMerge(base, extend) {
|
|
47
|
+
if (!isPlainObject(base) || !isPlainObject(extend)) return extend;
|
|
48
|
+
for(var key in extend){
|
|
49
|
+
if (key === '__proto__' || key === 'constructor' || key === 'prototype') continue;
|
|
50
|
+
base[key] = isPlainObject(base[key]) && isPlainObject(extend[key]) ? _recursiveMerge(base[key], extend[key]) : extend[key];
|
|
51
|
+
}
|
|
52
|
+
return base;
|
|
53
|
+
}
|
|
54
|
+
function _merge(isClone, isRecursive, items) {
|
|
55
|
+
var result;
|
|
56
|
+
if (isClone || !isPlainObject(result = items.shift())) result = {};
|
|
57
|
+
for(var index = 0; index < items.length; ++index){
|
|
58
|
+
var item = items[index];
|
|
59
|
+
// eslint-disable-next-line no-continue
|
|
60
|
+
if (!isPlainObject(item)) continue;
|
|
61
|
+
for(var key in item){
|
|
62
|
+
if (key === '__proto__' || key === 'constructor' || key === 'prototype') continue;
|
|
63
|
+
var value = isClone ? clone(item[key]) : item[key];
|
|
64
|
+
result[key] = isRecursive ? _recursiveMerge(result[key], value) : value;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return result;
|
|
68
|
+
}
|
|
@@ -1,18 +1,18 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { getEnv } from "@tarojs/taro";
|
|
2
2
|
export var harmony = function() {
|
|
3
3
|
return [
|
|
4
4
|
'harmony',
|
|
5
5
|
'harmonyhybrid',
|
|
6
6
|
'jdharmony'
|
|
7
|
-
].includes(
|
|
7
|
+
].includes(getEnv().toLowerCase());
|
|
8
8
|
};
|
|
9
9
|
export var web = function() {
|
|
10
10
|
return [
|
|
11
11
|
'web'
|
|
12
|
-
].includes(
|
|
12
|
+
].includes(getEnv().toLowerCase());
|
|
13
13
|
};
|
|
14
14
|
export var miniprogram = function() {
|
|
15
15
|
return [
|
|
16
16
|
'mini'
|
|
17
|
-
].includes(
|
|
17
|
+
].includes(getEnv().toLowerCase());
|
|
18
18
|
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function toArray<T>(value?: T | T[] | null): T[];
|