feat:修补资源url等

anrgct · May 27, 2020 · 0a2d49e · 0a2d49e
1 parent 5c9f5d1
commit 0a2d49e
Show file tree

Hide file tree

Showing 26 changed files with 601 additions and 116 deletions.
diff --git a/README.md b/README.md
@@ -1,12 +1,12 @@
 ### 沙拉查词-utools移植版本
 
-本项目移植自广受好评的chrome划词翻译插件—沙拉查词(v7.7.3)<https://saladict.crimx.com>
+本项目移植自广受好评的chrome划词翻译插件——沙拉查词
 
 当前版本已接近完美移植，主要功能都可以正常使用
 
 初次使用请参考使用手册<https://saladict.crimx.com/manual.html>
 
-![沙拉查词.gif](https://s2.ax1x.com/2020/02/03/1UMQ9x.gif)
+![沙拉查词.gif](https://s1.ax1x.com/2020/05/27/tEOkMn.gif)
 ### 沙拉查词-简单好用的查词工具！
 > **丰富的词典**
 >
@@ -18,12 +18,18 @@
 >
 > **完善的单词管理**
 >
-> 可开启查词历史记录；红心保存生词。单词源网页、上下文等信息均被保存。支持 WebDAV 同步和保存到扇贝生词本。
+> 可开启查词历史记录；红心保存生词。单词源网页、上下文等信息均被保存。
 >
 > **单词与句子发音**
 >
 > 多个词典支持单词真人发音；机器翻译长句朗读；发音可以开启波形控制，支持 AB 循环以及变速播放。
 
+### 更新记录
+
+>如果插件升级后，出现不能通过utools快捷查词的情况，请先备份utools数据（历史、生词、设置），然后到utools插件中心——账号与数据——清空“沙拉查词”文档，再作尝试
+- 2020-05-27 升级沙拉查词v7.12.1
+- 2020-02-03 初始版本——沙拉查词v7.3.3
+
 ### 特别感谢
 
 感谢crimx大佬的开挂式辅导、感谢却步大佬的耐心审查

diff --git a/addon.js → ext-saladic/addon.js b/addon.js → ext-saladic/addon.js
@@ -28,4 +28,12 @@ if(location.href.includes('quick-search.html')){
             window.parent.outPlugin && window.parent.outPlugin()
         } 
     })
+}
+var _windowClose = window.close;
+window.close = function(){
+    if(window.parent && window.parent.document.querySelector('.close-iframe-btn')){
+        window.parent.document.querySelector('.close-iframe-btn').click()
+    }else{
+        _windowClose();
+    }
 }
diff --git a/ext-saladic/assets/7.c7828999.js b/ext-saladic/assets/7.c7828999.js
diff --git a/ext-saladic/assets/background.4fda7b96.js b/ext-saladic/assets/background.4fda7b96.js
diff --git a/ext-saladic/assets/content.3db602ab.js b/ext-saladic/assets/content.3db602ab.js
diff --git a/ext-saladic/assets/options.fe276496.js b/ext-saladic/assets/options.fe276496.js
diff --git a/ext-saladic/assets/runtime.c624e5b8.js b/ext-saladic/assets/runtime.c624e5b8.js
diff --git a/ext-saladic/assets/selection.f1ea5ee9.js b/ext-saladic/assets/selection.f1ea5ee9.js
diff --git a/ext-saladic/assets/word-editor.4bb6a4dc.js b/ext-saladic/assets/word-editor.4bb6a4dc.js
diff --git a/ext-saladic/assets/wordpage.4c5f8ebe.js b/ext-saladic/assets/wordpage.4c5f8ebe.js
diff --git a/ext-saladic/audio-control.html b/ext-saladic/audio-control.html
@@ -6,15 +6,16 @@
     <title>Saladict</title>
     <script src="../webextensions-emulator-master/dist/background.js"></script>
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <link href="/assets/audio-control.0856fec3.css" rel="stylesheet">
+    <link href="./assets/audio-control.0856fec3.css" rel="stylesheet">
 </head>
 
 <body>
     <div id="root"></div>
-    <script src="/assets/runtime.c624e5b8.js"></script>
-    <script src="/assets/view-vendor.5dda2d4c.js"></script>
-    <script src="/assets/28.8f74ad14.js"></script>
-    <script src="/assets/audio-control.8abcf03d.js"></script>
+    <script src="./assets/runtime.c624e5b8.js"></script>
+    <script src="./assets/view-vendor.5dda2d4c.js"></script>
+    <script src="./assets/28.8f74ad14.js"></script>
+    <script src="./assets/audio-control.8abcf03d.js"></script>
+    <script src="./addon.js"></script>
 </body>
 
 </html>
diff --git a/ext-saladic/history.html b/ext-saladic/history.html
@@ -6,16 +6,17 @@
     <title>Saladict</title>
     <script src="../webextensions-emulator-master/dist/background.js"></script>
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <link href="/assets/history.8db84fa0.css" rel="stylesheet">
+    <link href="./assets/history.8db84fa0.css" rel="stylesheet">
 </head>
 
 <body>
     <div id="root"></div>
-    <script src="/assets/runtime.c624e5b8.js"></script>
-    <script src="/assets/view-vendor.5dda2d4c.js"></script>
-    <script src="/assets/antd.5db8c60d.js"></script>
-    <script src="/assets/wordpage.4c5f8ebe.js"></script>
-    <script src="/assets/history.770583ab.js"></script>
+    <script src="./assets/runtime.c624e5b8.js"></script>
+    <script src="./assets/view-vendor.5dda2d4c.js"></script>
+    <script src="./assets/antd.5db8c60d.js"></script>
+    <script src="./assets/wordpage.4c5f8ebe.js"></script>
+    <script src="./assets/history.770583ab.js"></script>
+    <script src="./addon.js"></script>
 </body>
 
 </html>
diff --git a/ext-saladic/notebook.html b/ext-saladic/notebook.html
@@ -6,16 +6,17 @@
     <title>Saladict</title>
     <script src="../webextensions-emulator-master/dist/background.js"></script>
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <link href="/assets/notebook.8db84fa0.css" rel="stylesheet">
+    <link href="./assets/notebook.8db84fa0.css" rel="stylesheet">
 </head>
 
 <body>
     <div id="root"></div>
-    <script src="/assets/runtime.c624e5b8.js"></script>
-    <script src="/assets/view-vendor.5dda2d4c.js"></script>
-    <script src="/assets/antd.5db8c60d.js"></script>
-    <script src="/assets/wordpage.4c5f8ebe.js"></script>
-    <script src="/assets/notebook.424c3f60.js"></script>
+    <script src="./assets/runtime.c624e5b8.js"></script>
+    <script src="./assets/view-vendor.5dda2d4c.js"></script>
+    <script src="./assets/antd.5db8c60d.js"></script>
+    <script src="./assets/wordpage.4c5f8ebe.js"></script>
+    <script src="./assets/notebook.424c3f60.js"></script>
+    <script src="./addon.js"></script>
 </body>
 
 </html>
diff --git a/ext-saladic/options.html b/ext-saladic/options.html
@@ -6,17 +6,19 @@
     <title>Saladict</title>
     <script src="../webextensions-emulator-master/dist/background.js"></script>
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <link href="/assets/options.f36d9a64.css" rel="stylesheet">
+    <link href="./assets/options.f36d9a64.css" rel="stylesheet">
+    <link href="./refactor.css" rel="stylesheet" >
 </head>
 
 <body>
     <div id="root"></div>
-    <script src="/assets/runtime.c624e5b8.js"></script>
-    <script src="/assets/view-vendor.5dda2d4c.js"></script>
-    <script src="/assets/franc.652a73a7.js"></script>
-    <script src="/assets/dexie.3f044acc.js"></script>
-    <script src="/assets/antd.5db8c60d.js"></script>
-    <script src="/assets/options.fe276496.js"></script>
+    <script src="./assets/runtime.c624e5b8.js"></script>
+    <script src="./assets/view-vendor.5dda2d4c.js"></script>
+    <script src="./assets/franc.652a73a7.js"></script>
+    <script src="./assets/dexie.3f044acc.js"></script>
+    <script src="./assets/antd.5db8c60d.js"></script>
+    <script src="./assets/options.fe276496.js"></script>
+    <script src="./addon.js"></script>
 </body>
 
 </html>
diff --git a/ext-saladic/popup.html b/ext-saladic/popup.html
@@ -6,17 +6,18 @@
     <title>Saladict</title>
     <script src="../webextensions-emulator-master/dist/background.js"></script>
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <link href="/assets/popup.670dd919.css" rel="stylesheet">
+    <link href="./assets/popup.670dd919.css" rel="stylesheet">
 </head>
 
 <body>
     <div id="root"></div>
-    <script src="/assets/runtime.c624e5b8.js"></script>
-    <script src="/assets/view-vendor.5dda2d4c.js"></script>
-    <script src="/assets/6.8712bd77.js"></script>
-    <script src="/assets/22.7140a0c3.js"></script>
-    <script src="/assets/7.c7828999.js"></script>
-    <script src="/assets/popup.9f54bf9a.js"></script>
+    <script src="./assets/runtime.c624e5b8.js"></script>
+    <script src="./assets/view-vendor.5dda2d4c.js"></script>
+    <script src="./assets/6.8712bd77.js"></script>
+    <script src="./assets/22.7140a0c3.js"></script>
+    <script src="./assets/7.c7828999.js"></script>
+    <script src="./assets/popup.9f54bf9a.js"></script>
+    <script src="./addon.js"></script>
 </body>
 
 </html>
diff --git a/ext-saladic/quick-search.html b/ext-saladic/quick-search.html
@@ -6,16 +6,18 @@
     <title>Saladict</title>
     <script src="../webextensions-emulator-master/dist/background.js"></script>
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <link href="/assets/quick-search.97fcb6aa.css" rel="stylesheet">
+    <link href="./assets/quick-search.97fcb6aa.css" rel="stylesheet">
+    <link href="./refactor.css" rel="stylesheet" >
 </head>
 
 <body>
     <div id="root"></div>
-    <script src="/assets/runtime.c624e5b8.js"></script>
-    <script src="/assets/view-vendor.5dda2d4c.js"></script>
-    <script src="/assets/6.8712bd77.js"></script>
-    <script src="/assets/7.c7828999.js"></script>
-    <script src="/assets/quick-search.87aa5c43.js"></script>
+    <script src="./assets/runtime.c624e5b8.js"></script>
+    <script src="./assets/view-vendor.5dda2d4c.js"></script>
+    <script src="./assets/6.8712bd77.js"></script>
+    <script src="./assets/7.c7828999.js"></script>
+    <script src="./assets/quick-search.87aa5c43.js"></script>
+    <script src="./addon.js"></script>
 </body>
 
 </html>
diff --git a/refactor.css → ext-saladic/refactor.css b/refactor.css → ext-saladic/refactor.css
@@ -48,26 +48,35 @@ iframe{
     display: none;
 }
 /* 设置页隐藏 */
-main.ant-layout-content[data-option-content=Dictionaries] .ant-col-13,
+/* main.ant-layout-content[data-option-content=Dictionaries] .ant-col-13,
 main.ant-layout-content[data-option-content=Profiles] .ant-col-12{
     width: 100%;
-}
-main.ant-layout-content[data-option-content=General] form>button,
+} */
+main.ant-layout-content .saladict-form-btns button:nth-of-type(2),
+main.ant-layout-content[data-option-content=General] form>.ant-row:nth-of-type(1),
+main.ant-layout-content[data-option-content=Notebook] form>.ant-row:nth-of-type(3),
+main.ant-layout-content[data-option-content=Notebook] form>.ant-row:nth-of-type(4),
+main.ant-layout-content[data-option-content=Notebook] form>.ant-row:nth-of-type(5),
+main.ant-layout-content[data-option-content=Notebook] form>.ant-row:nth-of-type(6),
 main.ant-layout-content[data-option-content=Privacy] form>.ant-row:nth-of-type(1),
+main.ant-layout-content[data-option-content=SearchModes] form>.ant-row:nth-of-type(1),
+main.ant-layout-content[data-option-content=SearchModes] form>.ant-row:nth-of-type(2),
+main.ant-layout-content[data-option-content=SearchModes] form>.ant-row:nth-of-type(3),
+main.ant-layout-content[data-option-content=SearchModes] form>.ant-row:nth-of-type(4),
+main.ant-layout-content[data-option-content=SearchModes] form>.ant-row:nth-of-type(5),
+main.ant-layout-content[data-option-content=SearchModes] form>.ant-row:nth-of-type(6),
+main.ant-layout-content[data-option-content=SearchModes] form>.ant-row:nth-of-type(7),
 main.ant-layout-content[data-option-content=DictPanel] form>.ant-row:nth-of-type(6),
 main.ant-layout-content[data-option-content=DictPanel] form>.ant-row:nth-of-type(7),
-main.ant-layout-content[data-option-content=DictPanel] form>.ant-row:nth-of-type(8),
 main.ant-layout-content[data-option-content=DictPanel] form>.ant-row:nth-of-type(9),
 main.ant-layout-content[data-option-content=DictPanel] form>.ant-row:nth-of-type(10),
-main.ant-layout-content[data-option-content=DictPanel] form>.ant-row:nth-of-type(11),
-main.ant-layout-content[data-option-content=General] form>.ant-row:nth-of-type(1){
+main.ant-layout-content[data-option-content=DictPanel] form>.ant-row:nth-of-type(11){
     display: none;
 }
-.ant-layout-sider .ant-menu-item:nth-of-type(5),
-.ant-layout-sider .ant-menu-item:nth-of-type(7),
 .ant-layout-sider .ant-menu-item:nth-of-type(8),
 .ant-layout-sider .ant-menu-item:nth-of-type(9),
-.ant-layout-sider .ant-menu-item:nth-of-type(10),
-.ant-layout-sider .ant-menu-item:nth-of-type(11){
+.ant-layout-sider .ant-menu-item:nth-of-type(11),
+.ant-layout-sider .ant-menu-item:nth-of-type(12),
+.ant-layout-sider .ant-menu-item:nth-of-type(13){
     display: none;
 }
diff --git a/ext-saladic/utools.html b/ext-saladic/utools.html
@@ -0,0 +1,15 @@
+<!doctype html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8">
+    <title>Webpack App</title>
+    <!-- 这是backgroud页，需要等到数据还原后再加载js -->
+    <link rel="stylesheet" href="./refactor.css">
+</head>
+
+<body>
+
+</body>
+
+</html>
diff --git a/ext-saladic/word-editor.html b/ext-saladic/word-editor.html
@@ -6,15 +6,16 @@
     <title>Saladict</title>
     <script src="../webextensions-emulator-master/dist/background.js"></script>
     <meta name="viewport" content="width=device-width,initial-scale=1">
-    <link href="/assets/word-editor.9632e88a.css" rel="stylesheet">
+    <link href="./assets/word-editor.9632e88a.css" rel="stylesheet">
 </head>
 
 <body>
     <div id="root"></div>
-    <script src="/assets/runtime.c624e5b8.js"></script>
-    <script src="/assets/view-vendor.5dda2d4c.js"></script>
-    <script src="/assets/19.d38773e2.js"></script>
-    <script src="/assets/word-editor.4bb6a4dc.js"></script>
+    <script src="./assets/runtime.c624e5b8.js"></script>
+    <script src="./assets/view-vendor.5dda2d4c.js"></script>
+    <script src="./assets/19.d38773e2.js"></script>
+    <script src="./assets/word-editor.4bb6a4dc.js"></script>
+    <script src="./addon.js"></script>
 </body>
 
 </html>
diff --git a/plugin.json b/plugin.json
@@ -1,9 +1,9 @@
 {
 	"pluginName": "沙拉查词",
 	"description": "沙拉查词-聚合词典专业查词翻译",
-	"main": "utools.html",
+	"main": "ext-saladic/utools.html",
 	"author": "anrgct",
-	"version": "0.2.2",
+	"version": "0.2.3",
 	"logo": "ext-saladic/assets/icon-128.png",
 	"preload": "preload.js",
 	"homepage": "https://github.com/anrgct/utools-saladic",

diff --git a/preload.js b/preload.js
@@ -8,7 +8,7 @@ utools.onPluginEnter(({ code, type, payload }) => {
         payload = ''
     }
     enterEventListener = () => {
-        openIframe('./quick-search.html', { hideCloseBtn: true })
+        openIframe('quick-search.html', { hideCloseBtn: true })
         document.execCommand = function (e) {
             // let clipboardText = clipboard.readText();
             // let queryStr = payload || clipboardText;
@@ -22,24 +22,29 @@ utools.onPluginEnter(({ code, type, payload }) => {
 })
 
 let localStorageData, indexedDBData;
-
-utools.onPluginReady(async () => {
-    await loadAllJs(["./webextensions-emulator-master/dist/core.js"]);
+async function init() {
+    await loadAllJs(["../webextensions-emulator-master/dist/core.js"]);
     localStorageData = new utoolsStorage('localStorageData');
     indexedDBData = new utoolsStorage('indexedDBData');
     restoreLocalStorageData();
-    let utoolsPageScript = ["./ext-saladic/assets/runtime.c624e5b8.js",
-        "./ext-saladic/assets/view-vendor.5dda2d4c.js",
-        "./ext-saladic/assets/dexie.3f044acc.js",
-        "./ext-saladic/assets/20.12068e63.js",
-        "./ext-saladic/assets/background.4fda7b96.js"];
+    let utoolsPageScript = [
+        "assets/runtime.c624e5b8.js",
+        "assets/view-vendor.5dda2d4c.js",
+        "assets/dexie.3f044acc.js",
+        "assets/20.12068e63.js",
+        "assets/background.4fda7b96.js",
+        "addon.js"];
     // 先加载沙拉
     await loadAllJs(utoolsPageScript);
     // 再还原indexedDB
     await restoreIndexedBDData()
 
     inited = true;
     enterEventListener && enterEventListener();
+}
+window.init = init;
+utools.onPluginReady(() => {
+    init()
 })
 // utools.onPluginOut(async () => {
 //     // console.log('用户退出插件');

diff --git a/utools.html b/utools.html
diff --git a/webextensions-emulator-master/dist/background.js b/webextensions-emulator-master/dist/background.js
@@ -81,7 +81,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 87);
+/******/ 	return __webpack_require__(__webpack_require__.s = 88);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -32064,7 +32064,8 @@ module.exports = {
 /* 84 */,
 /* 85 */,
 /* 86 */,
-/* 87 */
+/* 87 */,
+/* 88 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";