feat✨: update

Maicarons2022 · Jan 18, 2023 · ed54275 · ed54275
1 parent acca8ba
commit ed54275
Show file tree

Hide file tree

Showing 10 changed files with 255 additions and 14 deletions.
diff --git a/app.go b/app.go
@@ -30,6 +30,6 @@ func (a *App) Greet(name string) string {
 	return "Greet"
 }
 
-func (a *App) TestTime() string {
+func (a *App) Test() string {
 	return "时间：" + time.Now().Format("2006-01-02 15:04:05")
 }
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -8,7 +8,9 @@
     "preview": "vite preview"
   },
   "dependencies": {
+    "clipboard": "^2.0.11",
     "react": "^18.0.0",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.0.0",
     "react-router-dom": "^6.3.0",
     "react-windows-ui": "^4.2.1"

diff --git a/frontend/package.json.md5 b/frontend/package.json.md5
@@ -1 +1 @@
-0be9b244598407468588292ee7f57c65
+7bca1781412add2fe0042a6bbc989b4b
diff --git a/frontend/src/App.css b/frontend/src/App.css
@@ -1,9 +1,9 @@
 :root {
-    --PrimaryColor: #0078D7; /* Change of your choice */
+    --PrimaryColor: #0056d7; /* Change of your choice */
     --PrimaryColorLight: #47aeff; /* Lighter version of --PrimaryColor for DarkMode */
 }
 body {
-    font-family:  system-ui,"AlibabaPuHuiTi";
+    font-family: "HarmonyOS",system-ui;
 }
 ::selection {
     color: #ffffff;

diff --git a/frontend/src/assets/fonts/HarmonyOS.woff2 b/frontend/src/assets/fonts/HarmonyOS.woff2
diff --git a/frontend/src/pages/textarea.jsx b/frontend/src/pages/textarea.jsx
@@ -1,7 +1,9 @@
-import {Button, NavPageContainer, TextArea} from "react-windows-ui";
+import {Button, NavPageContainer} from "react-windows-ui";
 import {useState} from "react";
-import  "../../wailsjs/runtime";
+import {CopyToClipboard} from 'react-copy-to-clipboard';
+
 const Textareapage = (pop) => {
+
     const [resultText, setResultText] = useState("text");
     const updateResultText = (result) => setResultText(result);
     return (
@@ -23,12 +25,18 @@ const Textareapage = (pop) => {
                 margin: "auto",
             }}
             >
-                <Button icon={<i className="icons10-home"></i>} value={"格式化"} type={"primary"} onClick={()=>{}}/>
+                <Button  icon={<i className="icons10-home"></i>} value={"格式化"} type={"primary"} onClick={()=>{}}/>
                 <Button icon={<i className="icons10-home"></i>} value={"粘贴自剪切板"} type={"primary-outline"} onClick={()=>{
-
-                }}/>
-                <Button icon={<i className="icons10-home"></i>} value={"复制到剪切板"} type={"primary-outline"} onClick={()=>{
                 }}/>
+
+                <CopyToClipboard text={resultText}>
+                    <Button
+                            icon={<i className="icons10-home"></i>}
+                            value={"复制到剪切板"}
+                            type={"primary-outline"}
+                            onClick={()=>{}}>
+                    </Button>
+                </CopyToClipboard>
                 <Button icon={<i className="icons10-home"></i>} value={"清除"} type={"primary-outline"} onClick={()=>{
                     document.getElementById("t1").value="";
                     document.getElementById("t2").value="";

diff --git a/frontend/src/style.css b/frontend/src/style.css
@@ -1,7 +1,7 @@
 @font-face {
-    font-family: "AlibabaPuHuiTi";
+    font-family: "HarmonyOS";
     font-style: normal;
     font-weight: 400;
     src: local(""),
-    url("assets/fonts/AlibabaPuHuiTi-2-55-Regular.woff2") format("woff2");
+    url("assets/fonts/HarmonyOS.woff2") format("woff2");
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0be9b244598407468588292ee7f57c65
		7bca1781412add2fe0042a6bbc989b4b