Merge pull request 'zdg' (#72) from zdg into main

Reviewed-on: #72

electron.vite.config.mjs

@@ -17,13 +17,15 @@ export default defineConfig({
         // '@': resolve('./src/renderer/src'),
         // '@': path.resolve(__dirname, 'src/renderer/src'),
         '@': path.join(__dirname, './src/renderer/src'),
+        '@root': path.join(__dirname, '.'),
+
       }
     },
     server: {
       proxy: {
         '/dev-api': {
-          // target: 'http://27.128.240.72:7865',
-          target: 'http://192.168.2.52:7863',
+          target: 'http://27.128.240.72:7865',
+          // target: 'http://192.168.2.52:7863',
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, '')
         }

jsconfig.json

@@ -4,7 +4,8 @@
       "paths": {
           "@/*":[
               "src/renderer/src/*"
-          ]
+          ],
+          "@root/*":["./*"]
       }
   },
   "exclude": [

package.json

@@ -29,8 +29,11 @@
     "electron-log": "^5.1.7",
     "electron-updater": "^6.1.7",
     "element-plus": "^2.7.6",
+    "fabric": "5.3.0",
     "js-cookie": "^3.0.5",
     "jsencrypt": "^3.3.2",
+    "jsondiffpatch": "0.6.0",
+    "pdfjs-dist": "^4.4.168",
     "lodash": "^4.17.21",
     "pinia": "^2.1.7",
     "pinia-plugin-persistedstate": "^3.2.1",
@@ -41,6 +44,7 @@
   },
   "devDependencies": {
     "@electron-toolkit/eslint-config": "^1.0.2",
+    "@electron/remote": "^2.1.2",
     "@rushstack/eslint-patch": "^1.10.3",
     "@vitejs/plugin-vue": "^5.0.5",
     "@vue/eslint-config-prettier": "^9.0.0",

src/main/index.js

@@ -3,6 +3,11 @@ import { join } from 'path'
 import { electronApp, optimizer, is } from '@electron-toolkit/utils'
 import icon from '../../resources/icon.png?asset'
 import File from './file'
+// 代理 electron/remote
+// 第一步：引入remote
+import remote from '@electron/remote/main'
+// 第二步： 初始化remote
+remote.initialize()
 import updateInit from './update'
 
 File({ app, shell, BrowserWindow, ipcMain })
@@ -58,13 +63,19 @@ function createMainWindow() {
     webPreferences: {
       preload: join(__dirname, '../preload/index.js'),
       sandbox: false,
-      nodeIntegration: true
+      // nodeIntegration: true,
+      nodeIntegration: true,    // nodeApi调用
+      contextIsolation: false,  // 沙箱取消
+      // webSecurity: false        // 跨域关闭
     }
   })
 
   mainWindow.on('ready-to-show', () => {
     mainWindow.show()
   })
+  mainWindow.on('closed', () => {
+    mainWindow = null
+  })
   mainWindow.webContents.setWindowOpenHandler((details) => {
     shell.openExternal(details.url)
     return { action: 'deny' }
@@ -76,6 +87,10 @@ function createMainWindow() {
   } else {
     mainWindow.loadFile(join(__dirname, '../renderer/index.html'))
   }
+  // mainWindow.setAlwaysOnTop(true, "screen-saver") // 将窗口设置为顶层窗口
+  // mainWindow.setVisibleOnAllWorkspaces(true) // 如果窗口在所有工作区都可见
+  // 第三步： 开启remote服务
+  remote.enable(mainWindow.webContents)
 }
 
 
@@ -154,7 +169,6 @@ app.on('ready', () => {
     if (!mainWindow) {
       createMainWindow()
     }
-
     loginWindow.destroy()
     loginWindow = null
   })
@@ -174,6 +188,7 @@ app.on('ready', () => {
     createLinkWin(data)
   })
 
+  // 打开-登录窗口
   createLoginWindow()
   
   app.on('activate', function () {

src/main/tool.js

@@ -0,0 +1,78 @@
+/**
+ * @description: electron 封装的工具函数
+ * 消息整理
+ * tool-sphere:create 创建-悬浮球-窗口
+ */
+import { app, shell, BrowserWindow, ipcMain } from 'electron'
+import { is } from '@electron-toolkit/utils'
+
+// const baseUrl = 'http://localhost:5173/#' // 开发环境使用
+const baseUrl = process.env['ELECTRON_RENDERER_URL']+'/#' // 开发环境使用
+// 所有窗口
+let allWindow = {}
+// 其他已有窗口 wins
+export function init() {
+  // 创建工具-悬浮球
+  ipcMain.on('tool-sphere:create', async(e, data) => {
+    // console.log('测试xxxx', data)
+    await createTools(data) // 执行逻辑
+    e.reply('tool-sphere:create-reply', {code: 200, msg: 'success'}) // 返回结果
+  })
+}
+/**
+ * @description: 创建工具
+ * @param {*} url 路由地址
+ * @param {number} [width=800] 窗口宽度
+ * @param {number} [height=600] 窗口高度
+ * @param {{}} [option={}] 自定义选项
+ * @author: zdg
+ * @date 2021-07-05 14:07:01
+ */
+ export function createTools({url, width = 800, height = 600, option={}}) {
+  const { mainWindow } = allWindow||{} // 获取主窗口
+  const devUrl = `${baseUrl}${url}`
+  const buildUrl = `file://${__dirname}/index.html${url}`
+  const urlAll = is.dev ? devUrl : buildUrl
+  return new Promise((resolve) => {
+    let win = new BrowserWindow({
+      width, height,
+      type: 'toolbar',    // 创建的窗口类型为工具栏窗口
+      frame: false,       // 要创建无边框窗口
+      resizable: false,   // 禁止窗口大小缩放
+      transparent: true,  // 设置透明
+      alwaysOnTop: true,  // 窗口是否总是显示在其他窗口之前
+
+      parent: mainWindow, // 父窗口
+      autoClose: true,    // 关闭窗口后自动关闭
+      webPreferences: {
+        nodeIntegration: true,    // nodeApi调用
+        contextIsolation: false,  // 沙箱取消
+        webSecurity: false        // 跨域关闭
+      },
+      ...option
+    })
+    // console.log(urlAll)
+    // url = 'https://www.baidu.com'
+    console.log(urlAll)
+    win.loadURL(urlAll)
+    win.setFullScreen(true)                 // 设置窗口为全屏
+    win.setIgnoreMouseEvents(true)          // 忽略鼠标事件|使窗口不可选中
+    win.once('ready-to-show', () => {
+      win.show()
+      resolve(win)
+    })
+    win.on('closed', () => {
+      win = null
+    })
+  })
+}
+// 保存窗口
+export function setWin(win = {}) {
+  if (win && Object.keys(win).length){
+    Object.keys(win).forEach(key => {
+      if (!allWindow[key]) { // 不存在就保存
+        allWindow[key] = win[key]
+      }
+    })
+  }
+}

src/preload/index.js

@@ -2,8 +2,8 @@ import { contextBridge } from 'electron'
 import { electronAPI } from '@electron-toolkit/preload'
 
 // Custom APIs for renderer
-const api = {}
-
+const api = {
+}
 // Use `contextBridge` APIs to expose Electron APIs to
 // renderer only if context isolation is enabled, otherwise
 // just add to the DOM global.

src/renderer/public/lib/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

src/renderer/public/lib/web/cmaps/CNS2-V.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEáCNS2-H

src/renderer/public/lib/web/cmaps/ETenms-B5-H.bcmap

@@ -0,0 +1,3 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSEá	ETen-B5-H`
 ^

src/renderer/public/lib/web/cmaps/GB-H.bcmap

@@ -0,0 +1,4 @@
+àRCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE

!!<21>º]aX!!]`<60>21<32>>	<09>p<0B>z<EFBFBD>$]‚<06>"R‚d<E2809A>-Uƒ7<C692>*„
4„%<25>+ „Z „{<7B>/…%…<<3C>9K…b<E280A6>1]†.<2E>"‡‰`]‡,<2C>"]ˆ
+<EFBFBD>"]ˆh<CB86>"]‰F<E280B0>"]Š$<24>"]‹<02>"]‹`<60>"]Œ><3E>"]<5D><1C>"]<5D>z<EFBFBD>"]ŽX<C5BD>"]<5D>6<EFBFBD>"]<5D><14>"]<5D>r<EFBFBD>"]‘P<E28098>"]’.<2E>"]“<0C>"]“j<E2809C>"]”H<E2809D>"]•&<26>"]–<04>"]–b<E28093>"]—@<40>"]˜<1E>"]˜|<7C>"]™Z<E284A2>"]š8<C5A1>"]›<16>"]›t<E280BA>"]œR<C593>"]<5D>0<EFBFBD>"]ž<0E>"]žl<C5BE>"]ŸJ<C5B8>"] (<28>"]¡<06>"]¡d<C2A1>"]¢B<C2A2>"]£ <20>"X£~<7E>']¤W<C2A4>"]¥5<C2A5>"]¦<13>"]¦q<C2A6>"]§O<C2A7>"]¨-<2D>"]©<0B>"]©i<C2A9>"]ªG<C2AA>"]«%<25>"]¬<03>"]¬a<C2AC>"]­?<3F>"]®<1D>"]®{<7B>"]¯Y<C2AF>"]°7<C2B0>"]±<15>"]±s<C2B1>"]²Q<C2B2>"]³/<2F>"]´
<0A>"]´k<C2B4>"]µI<C2B5>"]¶'<27>"]·<05>"]·c<C2B7>"]¸A<C2B8>"]¹<1F>"]¹}<7D>"]º[<5B>"]»9