Merge branch 'dev'

src/main/data.js

@@ -59,6 +59,7 @@ export function updateAppConfig(
   forceAppendArray = false
 ) {
   const changedKeys = getUpdatedKeys(currentConfig, targetConfig);
+  logger.debug('changedKeys: ', changedKeys.length);
   // 只有有数据变更才更新配置
   if (changedKeys.length) {
     const oldConfig = clone(currentConfig, true);

src/main/ipc.js

@@ -135,11 +135,10 @@ ipcMain
     });
   })
   .on(events.EVENT_APP_CLIPBOARD_DATA_EDIT, async (e, params) => {
-    logger.info(params);
     await db.clipboardCard.updateById(params._id, params);
   })
   .on(events.EVENT_APP_CLIPBOARD_PASTE, async (e, params) => {
-    hideClipboard();
+    hideClipboard(params.isPaste);
     switch (params.data.cardType) {
       case CARD_TYPE.IMAGE:
         const image = nativeImage.createFromDataURL(params.data.base64data);

src/main/tray-handler.js

@@ -2,6 +2,9 @@ import { app, shell, dialog } from 'electron';
 import bootstrapPromise, { appConfigPath } from './bootstrap';
 import logger, { logPath } from './logger';
 import { meta } from '../shared/env';
+import { chooseSavePath, chooseFile } from '../shared/dialog';
+import { writeJson, readJson } from 'fs-extra';
+import { currentConfig, updateAppConfig } from './data';
 
 import {
   showWindow as showClipboard,
@@ -13,6 +16,49 @@ import {
   openDevtool as sod,
 } from './window-settings';
 import { notificationIcon } from '../shared/icon';
+import { showNotification } from './notification';
+
+// 导出配置文件
+export function exportConfigToFile() {
+  chooseSavePath('选择导出的目录', {}, 'config.json').then((filePath) => {
+    logger.debug('[exportConfigToFile]: filePath:', filePath);
+    if (filePath) {
+      writeJson(filePath, currentConfig, { spaces: '\t' });
+      showNotification(`点击打开: ${filePath}`, '导出配置成功!', () => {
+        shell.openPath(filePath).catch((e) => {
+          logger.error(`[tray]: 打开配置失败： ${e}`);
+        });
+      });
+    }
+  });
+}
+
+// 导入配置文件
+export function importConfigFromFile() {
+  chooseFile(
+    '选择config.json',
+    [{ name: 'Json', extensions: ['json'] }],
+    'config.json'
+  ).then((filePath) => {
+    logger.debug('[importConfigFromFile]: filePath:', filePath);
+    if (filePath) {
+      readJson(filePath)
+        .then((fileConfig) => {
+          logger.debug('fileConfig:', fileConfig);
+          updateAppConfig(fileConfig, false);
+          showNotification(`导入配置: ${filePath}`, '导入配置成功!');
+        })
+        .catch((e) => {
+          logger.error(e);
+          showNotification(e.toString(), '导入配置失败!', () => {
+            shell.openPath(filePath).catch((e) => {
+              logger.error(`[tray]: 打开配置失败： ${e}`);
+            });
+          });
+        });
+    }
+  });
+}
 
 // 打开窗口
 export function showClipboardWindow() {

src/main/tray.js

@@ -17,7 +17,11 @@ function generateMenus() {
     { label: '设置', click: handler.showSettingsWindow },
     {
       label: '配置',
-      submenu: [{ label: '打开配置文件', click: handler.openConfigFile }],
+      submenu: [
+        { label: '打开配置文件', click: handler.openConfigFile },
+        { label: '导出配置文件', click: handler.exportConfigToFile },
+        { label: '导入配置文件', click: handler.importConfigFromFile },
+      ],
     },
     {
       label: '帮助',

src/main/window-clipboard.js

@@ -126,8 +126,8 @@ export function getBounds() {
 /**
  * 隐藏主视图
  */
-export function hideWindow() {
-  if (isWin && activeWin) {
+export function hideWindow(isPaste) {
+  if (isWin && activeWin && isPaste) {
     activeWin.bringToTop();
     activeWin = null;
   }

src/renderer/ipc.js

@@ -24,7 +24,12 @@ ipcRenderer
   })
   .on(events.EVENT_RX_SYNC_MAIN, (e, appConfig) => {
     // 同步数据
-    store.dispatch('changeConfig', [appConfig]).then();
+    store
+      .dispatch('changeConfig', appConfig)
+      .then()
+      .catch((e) => {
+        console.log(e);
+      });
   })
   .on(events.EVENT_APP_CHANGE_BIND, (e, shortcut) => {
     changeBind(shortcut.funcName, shortcut.oldKey, shortcut.newKey);

src/renderer/views/clipboard/ClipboardCard.vue

@@ -474,6 +474,7 @@ export default {
     pasteAndHide(timeout) {
       hideAndPaste({
         data: this.data,
+        isPaste: true,
         directPaste: this.appConfig.directPaste,
         timeout,
       });

src/shared/dialog.js

@@ -0,0 +1,46 @@
+import { isWin } from './env';
+import { dialog as _dialog, remote } from 'electron';
+import logger from '../main/logger';
+
+const dialog = _dialog || remote.dialog;
+
+async function choose(
+  title,
+  filters,
+  isFile = true,
+  isSave = false,
+  defaultPath
+) {
+  const pathObject = await dialog[isSave ? 'showSaveDialog' : 'showOpenDialog'](
+    {
+      title,
+      defaultPath,
+      properties: [isFile ? 'openFile' : 'openDirectory'],
+      filters,
+      buttonLabel: isSave ? '导出配置' : '导入配置',
+    }
+  );
+  logger.debug('pathObject:', pathObject);
+
+  if (isSave && !pathObject.canceled) {
+    return pathObject.filePath;
+  } else if (
+    pathObject.filePaths &&
+    pathObject.filePaths.length &&
+    !pathObject.canceled
+  ) {
+    if (isWin) {
+      return pathObject.filePaths[0].replace(/\\/g, '\\\\');
+    }
+    return pathObject.filePaths[0];
+  }
+  return null;
+}
+
+export function chooseFile(title, filters, defaultPath) {
+  return choose(title, filters, true, false, defaultPath);
+}
+
+export function chooseSavePath(title, filters, defaultPath) {
+  return choose(title, filters, true, true, defaultPath);
+}