条形码优化

package-lock.json

@@ -3265,11 +3265,6 @@
       "dev": true,
       "optional": true
     },
-    "clamp": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/clamp/-/clamp-1.0.1.tgz",
-      "integrity": "sha1-ZqDmQBGBbjcZaCj9yMjBRzEshjQ="
-    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -7646,11 +7641,6 @@
         "object-visit": "^1.0.0"
       }
     },
-    "material-colors": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
-      "integrity": "sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg=="
-    },
     "md5.js": {
       "version": "1.3.5",
       "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
@@ -12360,17 +12350,6 @@
       "integrity": "sha512-cCjEgTD4nO5YQeRgdrrOqN7Qc2MzBx2u90J/CJ3Gp4PZ2sUONZE67/Qy+zWNHCWVCYsSEIvbnPSuiiQeEr1KSQ==",
       "dev": true
     },
-    "vue-color": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/vue-color/-/vue-color-2.8.1.tgz",
-      "integrity": "sha512-BoLCEHisXi2QgwlhZBg9UepvzZZmi4176vbr+31Shen5WWZwSLVgdScEPcB+yrAtuHAz42309C0A4+WiL9lNBw==",
-      "requires": {
-        "clamp": "^1.0.1",
-        "lodash.throttle": "^4.0.0",
-        "material-colors": "^1.0.0",
-        "tinycolor2": "^1.1.2"
-      }
-    },
     "vue-eslint-parser": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-5.0.0.tgz",

package.json

 {
     "name": "c-tool",
-    "version": "1.8.3",
+    "version": "1.9.0",
     "private": true,
     "scripts": {
         "serve": "vue-cli-service serve --port 8081",
@@ -8,10 +8,10 @@
         "lint": "vue-cli-service lint"
     },
     "dependencies": {
-        "@babel/parser": "^7.15.8",
-        "@prettier/plugin-php": "^0.17.5",
+        "@babel/parser": "^7.16.2",
+        "@prettier/plugin-php": "^0.17.6",
         "@prettier/plugin-xml": "^1.1.0",
-        "@typescript-eslint/typescript-estree": "^5.2.0",
+        "@typescript-eslint/typescript-estree": "^5.3.0",
         "angular-html-parser": "^1.8.0",
         "axios": "^0.21.4",
         "babel-runtime": "^6.26.0",
@@ -21,7 +21,6 @@
         "cronstrue": "^1.122.0",
         "crypto-js": "^3.3.0",
         "file": "^0.2.2",
-        "http-build-query": "^0.7.0",
         "ipinyinjs": "^1.0.0",
         "is-url": "^1.2.4",
         "jian_fan": "^1.0.3",
@@ -30,6 +29,7 @@
         "js-yaml": "^3.14.1",
         "jsbarcode": "^3.11.5",
         "json-to-properties": "^1.1.3",
+        "json5": "^2.2.0",
         "jsonlint": "^1.6.3",
         "jsrsasign": "^10.4.1",
         "jsrsasign-util": "^1.0.5",
@@ -39,24 +39,24 @@
         "moment": "^2.29.1",
         "monaco-editor": "^0.29.1",
         "monaco-editor-webpack-plugin": "^5.0.0",
-        "php-array-reader": "^1.3.0",
+        "php-array-reader": "^1.3.2",
         "phparr": "^0.2.0",
         "postcss-less": "^5.0.0",
-        "postcss-scss": "^4.0.1",
+        "postcss-scss": "^4.0.2",
         "prettier": "^2.4.1",
         "prettier-plugin-java": "^1.5.0",
         "prettier-plugin-sql": "^0.3.0",
         "properties-to-json": "^0.1.7",
         "qrcode": "^1.4.4",
         "qrcode-parser": "^1.2.0",
-        "query-string": "^6.13.7",
+        "query-string": "^6.14.1",
         "serialize-php": "^1.1.2",
         "sm-crypto": "^0.1.4",
         "system": "^2.0.1",
         "uuid": "^8.3.2",
         "view-design": "^4.6.1",
         "vue": "^2.6.14",
-        "vue-color": "^2.8.1",
+        "vue-i18n": "^8.26.7",
         "vue-router": "^3.5.3",
         "x2js": "github:abdolence/x2js"
     },
@@ -94,6 +94,9 @@
         },
         "parserOptions": {
             "parser": "babel-eslint"
+        },
+        "globals": {
+            "__": "writable"
         }
     },
     "postcss": {

src/tool/model.js

@@ -55,7 +55,7 @@ export const plugin = {
                 } else if (setting.autoReadCopy()) {
                     let paste = clipboard.paste()
                     if (!data[clipboardField] && paste) {
-                        if (setting.autoReadCopyFilter()){
+                        if (setting.autoReadCopyFilter()) {
                             paste = paste.trim()
                         }
                         data[clipboardField] = paste
@@ -67,17 +67,19 @@ export const plugin = {
         Vue.prototype.$saveToolData = function (data) {
             return history(model.getCurrentTool()).push(data)
         }
-        Vue.prototype.$clipboardCopy = function (data) {
-            if (!setting.autoSaveCopy() || !data) return
-            clipboard.copy(data,()=>{
-                this.$Message.success('结果已复制 ^o^')
-            })
+        Vue.prototype.$clipboardCopy = function (data, force = false) {
+            if ((setting.autoSaveCopy() || force) && data){
+                clipboard.copy(data, () => {
+                    this.$Message.success('结果已复制 ^o^')
+                })
+            }
         }
-        Vue.prototype.$clipboardCopyImages = function (data) {
-            if (!setting.autoSaveCopy() || !data) return
-            clipboard.copyImage(data,()=>{
-                this.$Message.success('图片已复制 ^o^')
-            })
+        Vue.prototype.$clipboardCopyImages = function (data, force = false) {
+            if ((setting.autoSaveCopy() || force) && data){
+                clipboard.copyImage(data, () => {
+                    this.$Message.success('图片已复制 ^o^')
+                })
+            }
         }
     },
 }