From 40ffde1f894eac4b1626563cac58d28017e8db83 Mon Sep 17 00:00:00 2001
From: baiy <wo@baiy.org>
Date: Mon, 21 Dec 2020 10:13:21 +0800
Subject: [PATCH] =?UTF-8?q?base64=20=E6=B7=BB=E5=8A=A0Url=20Safe=20?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=20#34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json              |  2 +-
 src/tool.vue              |  4 +-
 src/views/tool/base64.vue | 89 +++++++++------------------------------
 3 files changed, 24 insertions(+), 71 deletions(-)

diff --git a/package.json b/package.json
index 4785d95..07b8b23 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "c-tool",
-    "version": "1.3.0",
+    "version": "1.3.1",
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve --port 8081",
diff --git a/src/tool.vue b/src/tool.vue
index 9aeb34f..ed55d5a 100644
--- a/src/tool.vue
+++ b/src/tool.vue
@@ -49,7 +49,7 @@
                 <template slot-scope="{ row }" slot="_value">
                     <div>{{ historyValue(row.value) }}}</div>
                 </template>
-                <template slot-scope="{ index,row }" slot="_op">
+                <template slot-scope="{ index }" slot="_op">
                     <Button type="primary" size="small" @click="historyView(index)">查看</Button>
                     <Button type="primary" style="margin-left: 5px" @click="historyLoad(index)" size="small">加载</Button>
                 </template>
@@ -85,7 +85,7 @@ export default {
                 {
                     title: '数据',
                     slot: '_value',
-                    ellipsis:true
+                    ellipsis:true,
                 },
                 {
                     title: '操作',
diff --git a/src/views/tool/base64.vue b/src/views/tool/base64.vue
index 77da74a..4227d73 100644
--- a/src/views/tool/base64.vue
+++ b/src/views/tool/base64.vue
@@ -1,88 +1,43 @@
 <template>
-    <heightResize ignore :append="['.page-option-block']" @resize="resize">
-        <input-block bottom="0px" right="10px">
-            <autoHeightTextarea :height="height1" v-model="current.input" :placeholder="$t('base64_input')" />
-            <Upload slot="extra" action="#" :before-upload="handleUpload">
-                <Button size="small" type="primary" icon="ios-cloud-upload-outline">{{ $t('base64_upload_file') }}</Button>
-            </Upload>
-        </input-block>
-        <option-block class="page-option-block">
+    <div>
+        <Input v-model="current.input" :rows="7" type="textarea" placeholder="内容"></Input>
+        <option-block>
             <FormItem>
                 <ButtonGroup>
-                    <Button type="primary" @click="handle('encode')">{{ $t('base64_encode') }}</Button>
-                    <Button type="primary" @click="handle('decode')">{{ $t('base64_decode') }}</Button>
+                    <Button type="primary" @click="handle('encode')">编码</Button>
+                    <Button type="primary" @click="handle('decode')">解密</Button>
                 </ButtonGroup>
             </FormItem>
             <FormItem>
-                <Checkbox v-model="current.isUriSafe">{{ $t('base64_url_safe') }}</Checkbox>
+                <Checkbox v-model="current.isUriSafe">Url Safe</Checkbox>
             </FormItem>
         </option-block>
-        <input-block right="10px">
-            <pasteClipboardFlie @on-paste-file="handleUpload">
-                <autoHeightTextarea :height="height2" :value="current.output" :placeholder="$t('base64_output')" />
-            </pasteClipboardFlie>
-        </input-block>
-    </heightResize>
+        <Input v-model="current.output" :rows="7" type="textarea" placeholder="结果"></Input>
+    </div>
 </template>
 <script>
-import {Base64} from 'js-base64'
-import mimeType from 'mime-types'
-import moment from "moment";
-import pasteClipboardFlie from "./components/pasteClipboardFlie";
-import heightResize from "./components/heightResize";
-import autoHeightTextarea from "./components/autoHeightTextarea";
+import { Base64 } from 'js-base64'
+
 export default {
-    components: {
-        pasteClipboardFlie,
-        heightResize,
-        autoHeightTextarea
-    },
-    created() {
-        this.$initToolData('input')
+    created () {
+        this.current = Object.assign(this.current, this.$getToolData('input'))
     },
     methods: {
-        handle(v) {
+        handle (v) {
             if (this.current.input) {
-                if (v === "encode") {
-                    this.current.output = Base64.encode(this.current.input, this.current.isUriSafe)
-                } else {
-                    if (this.current.input.trim().indexOf('data:') === 0) {
-                        // 文件 base64 内容
-                        this.exportFile();
-                    }
-                    else{
-                        this.current.output = Base64.decode(this.current.input)
-                        this.$clipboardCopy(this.current.output)
-                    }
+                if (v === "encode"){
+                    this.current.output = Base64.encode(this.current.input,this.current.isUriSafe)
+                }
+                else{
+                    this.current.output = Base64.decode(this.current.input)
                 }
                 this.current.operation = v
+                this.$clipboardCopy(this.current.output)
                 this.$saveToolData(this.current)
             }
         },
-        handleUpload(file) {
-            let r = new FileReader()
-            r.readAsDataURL(file)
-            r.onloadend = () => {
-                this.current.output = r.result
-            }
-            return false
-        },
-        exportFile() {
-            let arr = this.current.input.split(','), mime = arr[0].match(/:(.*?);/)[1];
-            let objectUrl = window.URL.createObjectURL(new Blob([Base64.toUint8Array(arr[1])], {type: mime}));
-            let aEle = document.createElement("a");
-            aEle.download = `ctool-base64-decode-${moment().unix()}` + (mimeType.extension(mime) ? `.${mimeType.extension(mime)}` : "");
-            aEle.href = objectUrl;
-            aEle.click();
-            aEle.remove();
-            window.URL.revokeObjectURL(objectUrl);
-        },
-        resize(height){
-            this.height1 = Math.min(160,Math.ceil(height/2))
-            this.height2 = height - this.height1
-        }
     },
-    data() {
+    data () {
         return {
             current: {
                 input: '',
@@ -90,9 +45,7 @@ export default {
                 operation: '',
                 isUriSafe: false,
             },
-            height1:100,
-            height2:100
         }
     },
 }
-</script>
+</script>
\ No newline at end of file
-- 
GitLab