@aks-dev/easyui 1.0.95 → 1.0.98

package/lib/Echarts/EchartsView.tsx

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-05-05 14:52:53
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-14 18:24:09
+ * @LastEditTime: 2022-07-21 18:21:18
  * @FilePath: /@aks-dev/easyui/lib/Echarts/EchartsView.tsx
  */
 import * as React from 'react'
@@ -53,11 +53,12 @@ const EchartsView: React.FC<EchartsViewProps> = (props) => {
 
 
     React.useEffect(() => {
+        // console.log('useEffect', state.isLoaded,props.option)
         if (state.isLoaded) {
             const run = `
                         ;(function() {
-                            var myChart = echarts.init(document.getElementById('main'));
-                            myChart.setOption(${toString(props.option)});
+                            var instance = echarts.init(document.getElementById('main'));
+                            instance.setOption(${toString(props.option)});
                         })();
                         `
             WebViewRef.current?.injectJavaScript(run);
@@ -65,11 +66,13 @@ const EchartsView: React.FC<EchartsViewProps> = (props) => {
             return () => {
                 const run = `
                             ;(function() {
-                                var myChart = echarts.init(document.getElementById('main'));
-                                myChart.clear();
+                                var instance = echarts.getInstanceByDom(document.getElementById('main'));
+                                instance.clear();
                             })();
                             `
                 WebViewRef.current?.injectJavaScript(run);
+
+
             }
         }
 
@@ -81,15 +84,16 @@ const EchartsView: React.FC<EchartsViewProps> = (props) => {
 
 
     const injectedJavaScript = (): string => {
+        // console.log('injectedJavaScript',props.option)
         let height = state.height ? `${state.height}px` : 'auto'
         let width = state.width ? `${state.width}px` : 'auto'
         return `
                 ;(function() {
                     document.getElementById('main').style.height = "${height}";
                     document.getElementById('main').style.width = "${width}";
-                    var myChart = echarts.init(document.getElementById('main'));
-                    myChart.setOption(${toString(props.option)});
-                    myChart.on('click', function(params) {
+                    var instance = echarts.init(document.getElementById('main'));
+                    instance.setOption(${toString(props.option)});
+                    instance.on('click', function(params) {
                         var seen = [];
                         var paramsString = JSON.stringify(params, function(key, val) {
                         if (val != null && typeof val == "object") {
@@ -100,7 +104,7 @@ const EchartsView: React.FC<EchartsViewProps> = (props) => {
                         }
                         return val;
                         });
-                        window.ReactNativeWebView.postMessage(JSON.stringify({"types":"ON_PRESS","payload": paramsString}));
+                       // window.ReactNativeWebView.postMessage(JSON.stringify({"types":"ON_PRESS","payload": paramsString}));
                     });
                 })();
                 `
@@ -123,12 +127,15 @@ const EchartsView: React.FC<EchartsViewProps> = (props) => {
                 }} // 设置空View，修复ioswebview闪白
                 style={{ backgroundColor: (props.style as ViewStyle)?.backgroundColor || 'transparent' }} // 设置背景色透明，修复android闪白
                 scrollEnabled={false}
-                // onMessage={onMessage}
+                // onMessage={e=>{
+                //     console.log(e)
+                // }}
                 javaScriptEnabled={true}
                 injectedJavaScript={injectedJavaScript()}
                 startInLoadingState={false}
                 onLoadEnd={(_) => {
                     dispatch({ isLoaded: true })
+                    // console.log('onLoadEnd')
                 }}
                 source={{
                     baseUrl: '',
@@ -152,4 +159,5 @@ const styles = StyleSheet.create({
 
 
 
-export default React.memo(EchartsView)
+export default EchartsView
+// React.memo(EchartsView)

package/lib/Hud/Toast/Toast.tsx

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2021-04-27 10:38:04
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-12 11:33:40
- * @FilePath: /@aks/easyui/lib/Easy-Hud/Toast/Toast.tsx
+ * @LastEditTime: 2022-08-04 10:43:06
+ * @FilePath: /@aks-dev/easyui/lib/Hud/Toast/Toast.tsx
  */
 import React, { useImperativeHandle, useState, useRef } from 'react';
 import { View, StyleSheet, Text, Dimensions, Animated, Easing } from 'react-native';
@@ -16,6 +16,7 @@ const errorMsg = '(^_^)∠※ 送你一束小花'
 export const Toast = React.forwardRef<ToastCurrent, {}>((_, ref) => {
     const [tipText, setTipText] = useState(errorMsg);
     const fade = useRef(new Animated.Value(0)).current;
+    const [tipTheme, setTipTheme] = useState<'black' | 'white'>('black')
 
     const fadeAnimation = Animated.sequence([
         Animated.timing(fade, {
@@ -34,8 +35,9 @@ export const Toast = React.forwardRef<ToastCurrent, {}>((_, ref) => {
     ])
 
     useImperativeHandle<unknown, ToastCurrent>(ref, () => ({
-        showToast: (content: string) => {
+        showToast: (content: string, theme?: 'black' | 'white') => {
             setTipText(content || errorMsg)
+            setTipTheme(theme ? theme : 'black')
             fadeAnimation.reset()
             fadeAnimation.start()
         },
@@ -43,8 +45,8 @@ export const Toast = React.forwardRef<ToastCurrent, {}>((_, ref) => {
 
     return (
         <Animated.View style={{ ...styles.toastContainer, opacity: fade }}>
-            <View style={styles.toastTipsContainer}>
-                <Text numberOfLines={5} style={{ ...styles.toastTitle, }}>{tipText} </Text>
+            <View style={[styles.toastTipsContainer, { backgroundColor: tipTheme == 'black' ? '#00000088' : '#ffffff88' }]}>
+                <Text numberOfLines={5} style={[styles.toastTitle, { color: tipTheme ? 'white' : 'black'}]}>{tipText} </Text>
             </View>
         </Animated.View>
 
@@ -53,7 +55,7 @@ export const Toast = React.forwardRef<ToastCurrent, {}>((_, ref) => {
 
 export const toastRef = React.createRef<ToastCurrent>();
 
-export const showToast = (content: string) => toastRef.current?.showToast(content)
+export const showToast = (content: string, theme?: 'black' | 'white') => toastRef.current?.showToast(content, theme)
 
 
 

package/lib/Hud/Toast/index.ts

@@ -2,8 +2,8 @@
  * @Author: shiguo
  * @Date: 2022-04-18 19:18:03
  * @LastEditors: shiguo
- * @LastEditTime: 2022-05-12 11:33:32
- * @FilePath: /@aks/easyui/lib/Easy-Hud/Toast/index.ts
+ * @LastEditTime: 2022-08-04 09:51:29
+ * @FilePath: /@aks-dev/easyui/lib/Hud/Toast/index.ts
  */
 import * as React from 'react'
 
@@ -11,10 +11,10 @@ import * as React from 'react'
 
 
 export declare type ToastCurrent = {
-    showToast: (content: string) => void;
+    showToast: (content: string, theme?: 'black' | 'white') => void;
 }
 
-export declare const showToast: (content: string) => void;
+export declare const showToast: (content: string, theme?: 'black' | 'white') => void;
 
 
 export declare const toastRef: React.RefObject<ToastCurrent>;

package/lib/MenuView/index.ts

@@ -2,7 +2,7 @@
  * @Author: shiguo
  * @Date: 2022-07-14 18:09:02
  * @LastEditors: shiguo
- * @LastEditTime: 2022-07-21 16:07:23
+ * @LastEditTime: 2022-07-21 16:08:43
  * @FilePath: /@aks-dev/easyui/lib/MenuView/index.ts
  */
 
@@ -18,7 +18,7 @@ export type MenuItem = {
 }
 
 export type MenuProps = {
-    style: StyleProp<ViewStyle> | undefined;
+    style?: StyleProp<ViewStyle> | undefined;
     data?: MenuItem[];
     onItemClick?: (index: number, extra?: any) => void;
 } & Readonly<{ children?: React.ReactNode | undefined }>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aks-dev/easyui",
-  "version": "1.0.95",
+  "version": "1.0.98",
   "description": "移动端App开发工具包",
   "main": "./src/index.ts",
   "typings": "./src/index.d.ts",