Version_0.2.4

uni-helper · Oct 29, 2023 · 6573c63 · 6573c63
1 parent 661501f
commit 6573c63
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 19 deletions.
diff --git a/esm/device.js b/esm/device.js
@@ -1,9 +1,9 @@
-import * as origin from 'galanga';
+import { clipboard as clipboardO, checkDeviceType as checkDeviceTypeO, checkNotNull, checkNull, share as shareO, shakeObject } from 'galanga';
 export const clipboard = {
     read: async (onlyString = true) => {
         let result;
         // #ifdef H5
-        result = await origin.clipboard.read(onlyString);
+        result = await clipboardO.read(onlyString);
         // #endif
         // #ifndef H5
         result = await uni.getClipboardData().then((res) => {
@@ -20,7 +20,7 @@ export const clipboard = {
     write: async (value) => {
         let result;
         // #ifdef H5
-        result = await origin.clipboard.write(value);
+        result = await clipboardO.write(value);
         // #endif
         // #ifndef H5
         result = await uni.setClipboardData({
@@ -38,12 +38,12 @@ export const clipboard = {
 export function checkDeviceType(types = ['os', 'browser', 'device', 'platform']) {
     let result;
     // #ifdef H5
-    result = origin.checkDeviceType(types);
+    result = checkDeviceTypeO(types);
     // #endif
     // #ifndef H5
     const res = uni.getSystemInfoSync();
     if (res.uniPlatform === 'web') {
-        return origin.checkDeviceType(types);
+        return checkDeviceTypeO(types);
     }
     else {
         const deviceInfo = {
@@ -64,15 +64,15 @@ export function checkDeviceType(types = ['os', 'browser', 'device', 'platform'])
             result = deviceInfo[types];
         }
         else {
-            result = origin.shakeObject(deviceInfo, types);
+            result = shakeObject(deviceInfo, types);
         }
     }
     // #endif
     return result;
 }
 export function share({ content = 'none', title = 'galanga', url = '', type = 'system', files = [], } = {}) {
     // #ifdef H5
-    origin.share({
+    shareO({
         content,
         title,
         url,
@@ -96,7 +96,7 @@ export function share({ content = 'none', title = 'galanga', url = '', type = 's
         if (shareInfo.provider === 'sinaweibo') {
             shareInfo.type = 0;
         }
-        if (origin.checkNotNull(url)) {
+        if (checkNotNull(url)) {
             shareInfo.href = url;
         }
         uni.share(shareInfo);
@@ -105,7 +105,7 @@ export function share({ content = 'none', title = 'galanga', url = '', type = 's
     // #ifndef H5 || APP-PLUS
     uni.showShareMenu({
         title: title,
-        content: origin.checkNull(url) ? content : content + '\n' + url,
+        content: checkNull(url) ? content : content + '\n' + url,
     });
     // #endif
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@uni-helper/galanga",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "JS common function library(UNI-APP version of Galanga)",
   "main": "esm/index.js",
   "jsnext:main": "esm/index.js",

diff --git a/src/device.ts b/src/device.ts
@@ -1,11 +1,18 @@
-import * as origin from 'galanga'
+import {
+  clipboard as clipboardO,
+  checkDeviceType as checkDeviceTypeO,
+  checkNotNull,
+  checkNull,
+  share as shareO,
+  shakeObject
+} from 'galanga'
 declare const uni: any
 
 export const clipboard = {
   read: async (onlyString = true) => {
     let result: string | ClipboardItems | null
     // #ifdef H5
-    result = await origin.clipboard.read(onlyString)
+    result = await clipboardO.read(onlyString)
     // #endif
     // #ifndef H5
     result = await uni.getClipboardData().then((res) => {
@@ -22,7 +29,7 @@ export const clipboard = {
   write: async (value: any) => {
     let result: boolean
     // #ifdef H5
-    result = await origin.clipboard.write(value)
+    result = await clipboardO.write(value)
     // #endif
     // #ifndef H5
     result = await uni.setClipboardData({
@@ -48,12 +55,12 @@ interface DeviceInfo {
 export function checkDeviceType(types: string[] | string = ['os', 'browser', 'device', 'platform']): DeviceInfo | string | object {
   let result: DeviceInfo | string | object
   // #ifdef H5
-  result = origin.checkDeviceType(types) as DeviceInfo | string | object
+  result = checkDeviceTypeO(types) as DeviceInfo | string | object
   // #endif
   // #ifndef H5
   const res = uni.getSystemInfoSync()
   if (res.uniPlatform === 'web') {
-    return origin.checkDeviceType(types) as DeviceInfo | string | object
+    return checkDeviceTypeO(types) as DeviceInfo | string | object
   } else {
     const deviceInfo: DeviceInfo = {
       os: res.osName,
@@ -71,7 +78,7 @@ export function checkDeviceType(types: string[] | string = ['os', 'browser', 'de
     if (typeof types === 'string') {
       result = deviceInfo[types]
     } else {
-      result = origin.shakeObject(deviceInfo, types);
+      result = shakeObject(deviceInfo, types);
     }
   }
   // #endif
@@ -96,7 +103,7 @@ export function share({
   files = [] as File[],
 } = {}) {
   // #ifdef H5
-  origin.share({
+  shareO({
     content,
     title,
     url,
@@ -119,7 +126,7 @@ export function share({
     if (shareInfo.provider === 'sinaweibo') {
       shareInfo.type = 0
     }
-    if (origin.checkNotNull(url)) {
+    if (checkNotNull(url)) {
       shareInfo.href = url
     }
     uni.share(shareInfo)
@@ -128,7 +135,7 @@ export function share({
   // #ifndef H5 || APP-PLUS
   uni.showShareMenu({
     title: title,
-    content: origin.checkNull(url) ? content : content + '\n' + url,
+    content: checkNull(url) ? content : content + '\n' + url,
   })
   // #endif
 }