对大图标进行压缩

src/assets/plugins/picture-compressor.js

@@ -0,0 +1,132 @@
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof define === 'function' && define.amd ? define(factory) :
+  (global = global || self, global.pictureCompress = factory());
+}(this, function () { 'use strict';
+
+  /**
+   * 将图片压缩为对应尺寸
+   * @param {Object} options 
+   * @param {String} options.img 图片的url或者base64数据
+   * @param {Number} options.width 目标图片的宽度
+   * @param {Number} options.height 目标图片的高度
+   * @param {Number} options.quality 生成目标图片质量
+   * @param {String} options.fit 图片压缩填充模式默认 scale：按比例缩放，可选 fill：按使用目标尺寸
+   * @param {String} options.type 图片压缩类型默认 jpg，可选 png
+   * @param {Number} options.rotate 图片旋转，由于手机拍照的角度和我们使用的头像不一致，需要旋转 默认0 仅支持 90 180 -90
+   * @returns {Promise} then {width,height,img}
+   */
+  function pictureCompress(options) {
+    return new Promise(function (resolve, reject) {
+      if (!options.img) {
+        reject(new Error('need img'));
+        return;
+      }
+
+      var imgSrc = options.img,
+          width = options.width || 640,
+          height = options.height || 640,
+          type = options.type || 'jpg',
+          quality = options.quality || 0.92,
+          fit = options.fit || 'scale',
+          rotate = options.rotate || 0;
+
+      if (width <= 0 || height <= 0) {
+        reject(new Error('dist width or height need > 0'));
+        return;
+      }
+
+      if (!/jpg|png|jpeg/.test(type)) {
+        reject(new Error('type need jpg or png!'));
+        return;
+      }
+
+      if (rotate !== 90 && rotate !== -90 && rotate !== 0 && rotate !== 180) {
+        reject(new Error('rotate mast be 0 90 -90 180!'));
+        return;
+      }
+
+      var changeWidthAndHeight = rotate === 90 || rotate === -90;
+      var image = new Image();
+      image.src = imgSrc;
+
+      image.onload = function () {
+        var distSize = getDistSize({
+          width: changeWidthAndHeight ? this.naturalHeight : this.naturalWidth,
+          height: changeWidthAndHeight ? this.naturalWidth : this.naturalHeight
+        }, {
+          width: changeWidthAndHeight ? height : width,
+          height: changeWidthAndHeight ? width : height
+        }, fit);
+        var imgData = compress(this, distSize.width, distSize.height, type, quality, rotate);
+        resolve({
+          width: distSize.width,
+          height: distSize.height,
+          img: imgData
+        });
+      };
+
+      image.onerror = function (err) {
+        reject(err);
+      };
+    });
+  }
+  /**
+   * 将图片转换为固定尺寸的
+   * @param {Image} img 图片数据
+   * @param {Number} width 转换之后的图片宽度
+   * @param {Number} height 转换之后的图片高度
+   * @param {String} type base64的图片类型 jpg png
+   * @param {Number} quality 转换之后的图片质量
+   */
+
+
+  function compress(img, width, height, type, quality, rotate) {
+    var canvas = document.createElement('canvas');
+    var ctx = canvas.getContext('2d');
+    var types = {
+      'jpg': 'image/jpeg',
+      'jpeg': 'image/jpeg',
+      'png': 'image/png'
+    };
+    canvas.width = width;
+    canvas.height = height;
+
+    if (rotate === 90) {
+      ctx.translate(width, 0);
+      ctx.rotate(90 * Math.PI / 180);
+      ctx.drawImage(img, 0, 0, height, width);
+    } else if (rotate === -90) {
+      ctx.translate(0, height);
+      ctx.rotate(-90 * Math.PI / 180);
+      ctx.drawImage(img, 0, 0, height, width);
+    } else if (rotate === 180) {
+      ctx.translate(width, height);
+      ctx.rotate(180 * Math.PI / 180);
+      ctx.drawImage(img, 0, 0, width, height);
+    } else {
+      ctx.drawImage(img, 0, 0, width, height);
+    }
+
+    return canvas.toDataURL(types[type], quality);
+  }
+  /**
+   * 选择源尺寸与目标尺寸比例中较小的那个，保证图片可以完全显示
+   * 最大值不超过1，如果图片源尺寸小于目标尺寸，则不做处理，返回图片原尺寸
+   * @param {Object} source 源图片的宽高
+   * @param {Object} dist 目标图片的宽高
+   */
+
+
+  function getDistSize(source, dist, fit) {
+    if (fit === 'fill') return dist;
+    var scale = Math.min(dist.width / source.width, dist.height / source.height, 1);
+    return {
+      width: Math.round(source.width * scale),
+      height: Math.round(source.height * scale)
+    };
+  }
+
+  return pictureCompress;
+
+}));

src/index.html

@@ -14,6 +14,7 @@
     <script src="assets/plugins/mousetrap/mousetrap-record.min.js"></script>
     <script src="assets/plugins/codemirrorloader.js"></script>
     <script src="assets/plugins/select2/select2.min.js"></script>
+    <script src="assets/plugins/picture-compressor.js"></script>
     <title>快捷命令</title>
 </head>
 

src/preload.js

@@ -129,8 +129,8 @@ quickcommand = {
             var options = {
                 onBeforeOpen: () => {
                     clickButton = i => {
-                        setTimeout(() => { swal.clickConfirm() }, 50);
                         reslove({ id: i, text: buttons[i] })
+                        swal.clickConfirm()
                     }
                     $(".output").is(":parent") && utools.setExpendHeight(600) || modWindowHeight($('.swal2-popup').outerHeight() + 20)
                 },
@@ -276,8 +276,7 @@ quickcommand = {
         });
     },
 
-    showConfirmBox: function(title) {
+    showConfirmBox: async function (title) {
-        return new Promise((reslove, reject) => {
         let options = {
             text: title,
             icon: 'warning',
@@ -285,12 +284,10 @@ quickcommand = {
             confirmButtonColor: '#3085d6',
             cancelButtonColor: '#d33',
             confirmButtonText: '确定！',
-                cancelButtonText: '手抖...',
+            cancelButtonText: '手抖...'
         }
-            Swal.fire(options).then(result => {
+        let result = await Swal.fire(options)
-                if (result.value) reslove()
+        if (result.value) return true;
-            })
-        });
     },
 
     // 关闭进程
@@ -387,14 +384,7 @@ let createNodeVM = (payload = "") => {
     return vm
 }
 
-let parseItem = item => {
+let stringifyAll = item => {
-    if (typeof (item) == "object") {
-        if (Buffer.isBuffer(item)) {
-            var bufferString = `[Buffer ${item.slice(0, 50).toString('hex').match(/\w{1,2}/g).join(" ")}`
-            if (item.length > 50) bufferString += `... ${(item.length / 1000).toFixed(2)}kb`
-            return bufferString + ']'
-        } else {
-            try {
     var cache = [];
     var string = JSON.stringify(item, (key, value) => {
         if (typeof value === 'object' && value !== null) {
@@ -404,9 +394,19 @@ let parseItem = item => {
         return value;
     }, '\t')
     if (string != "{}") return string
-            } catch (error) { }
 }
-    } else if (typeof (item) == "undefined") {
+
+let parseItem = item => {
+    if (typeof (item) == "object") {
+        if (Buffer.isBuffer(item)) {
+            var bufferString = `[Buffer ${item.slice(0, 50).toString('hex').match(/\w{1,2}/g).join(" ")}`
+            if (item.length > 50) bufferString += `... ${(item.length / 1000).toFixed(2)}kb`
+            return bufferString + ']'
+        } else {
+            try { return stringifyAll(item) }
+            catch (error) { }
+        }
+    } else if (typeof item == "undefined") {
         return "undefined"
     }
     return item.toString()
@@ -543,8 +543,24 @@ getQuickCommandScriptFile = ext => {
     return path.join(os.tmpdir(), `QuickCommandTempScript.${ext}`)
 }
 
-getBase64Ico = path => {
+getBase64Ico = async path => {
-    return fs.readFileSync(path, 'base64');
+    let sourceImage = 'data:image/png;base64,' + fs.readFileSync(path, 'base64')
+    let compressedImage = await getCompressedIco(path)
+    return compressedImage.length > sourceImage.length ? sourceImage : compressedImage
+}
+
+getCompressedIco = async (img, width = 40) => {
+    let compressedImage = await pictureCompress({ img: img, width: width, height: width, type: 'png', quality: 1 })
+    return compressedImage.img
+}
+
+getDefaultCommands = () => {
+    let baseDir = path.join(__dirname, 'defaults')
+    let defaultCommands = {}
+    fs.readdirSync(baseDir).forEach(f => {
+        defaultCommands[f.slice(0, -5)] = path.join(baseDir, f)
+    })
+    return defaultCommands
 }
 
 getFileInfo = options => {