Compare commits

..

No commits in common. "0ec7cb7c4ff9213e31e18f3e0a3326a4354721a5" and "0cd9c071d714af85a8adac236276f726affc4db2" have entirely different histories.

6 changed files with 10 additions and 12 deletions

@ -1,6 +1,6 @@
{ {
"name": "zzz-signal-search-export", "name": "zzz-signal-search-export",
"version": "1.1.6", "version": "1.1.5",
"autoUpdateActive": true, "autoUpdateActive": true,
"autoUpdateFrom": "1.1.0", "autoUpdateFrom": "1.1.0",
"main": "./dist/electron/main/main.js", "main": "./dist/electron/main/main.js",
@ -110,7 +110,7 @@
"tailwindcss": "^3.0.16", "tailwindcss": "^3.0.16",
"vite": "2.7.13", "vite": "2.7.13",
"vue": "^3.2.29", "vue": "^3.2.29",
"winreg": "1.2.4", "winreg": "^1.2.4",
"yauzl": "^2.10.0" "yauzl": "^2.10.0"
}, },
"keywords": [ "keywords": [

@ -3,7 +3,7 @@
"ui.button.load": "Load data", "ui.button.load": "Load data",
"ui.button.update": "Update", "ui.button.update": "Update",
"ui.button.directUpdate": "Direct update", "ui.button.directUpdate": "Direct update",
"ui.button.files": "Import/Export", "ui.button.files": "Export Files",
"ui.button.excel": "Export Excel", "ui.button.excel": "Export Excel",
"ui.button.uigf": "Export UIGF", "ui.button.uigf": "Export UIGF",
"ui.button.import": "Import UIGF", "ui.button.import": "Import UIGF",

@ -3,7 +3,7 @@
"ui.button.load": "加载数据", "ui.button.load": "加载数据",
"ui.button.update": "更新数据", "ui.button.update": "更新数据",
"ui.button.directUpdate": "直接更新", "ui.button.directUpdate": "直接更新",
"ui.button.files": "导入/导出", "ui.button.files": "导文件",
"ui.button.excel": "导出Excel", "ui.button.excel": "导出Excel",
"ui.button.uigf":"导出UIGF", "ui.button.uigf":"导出UIGF",
"ui.button.import":"导入UIGF", "ui.button.import":"导入UIGF",

@ -3,7 +3,7 @@
"ui.button.load": "加載數據", "ui.button.load": "加載數據",
"ui.button.update": "更新數據", "ui.button.update": "更新數據",
"ui.button.directUpdate": "直接更新", "ui.button.directUpdate": "直接更新",
"ui.button.files": "導入/匯出", "ui.button.files": "導文件",
"ui.button.excel": "導出Excel", "ui.button.excel": "導出Excel",
"ui.button.uigf":"導出UIGF", "ui.button.uigf":"導出UIGF",
"ui.button.import":"導入UIGF", "ui.button.import":"導入UIGF",

@ -4,7 +4,7 @@
<div class="space-x-3"> <div class="space-x-3">
<el-button type="primary" :icon="state.status === 'init' ? 'milk-tea': 'refresh-right'" class="focus:outline-none" :disabled="!allowClick()" plain @click="fetchData()" :loading="state.status === 'loading'">{{state.status === 'init' ? ui.button.load: ui.button.update}}</el-button> <el-button type="primary" :icon="state.status === 'init' ? 'milk-tea': 'refresh-right'" class="focus:outline-none" :disabled="!allowClick()" plain @click="fetchData()" :loading="state.status === 'loading'">{{state.status === 'init' ? ui.button.load: ui.button.update}}</el-button>
<el-dropdown :disabled="!gachaData" @command="exportCommand"> <el-dropdown :disabled="!gachaData" @command="exportCommand">
<el-button :disabled="!gachaData" icon="folder-opened" class="focus:outline-none" type="success" plain> <el-button :disabled="!gachaData" icon="download" class="focus:outline-none" type="success" plain>
{{ui.button.files}} {{ui.button.files}}
<el-icon class="el-icon--right"><arrow-down /></el-icon> <el-icon class="el-icon--right"><arrow-down /></el-icon>
</el-button> </el-button>
@ -12,10 +12,10 @@
<el-dropdown-menu> <el-dropdown-menu>
<el-dropdown-item command="excel">{{ui.button.excel}}</el-dropdown-item> <el-dropdown-item command="excel">{{ui.button.excel}}</el-dropdown-item>
<el-dropdown-item command="uigf-json">{{ui.button.uigf}}</el-dropdown-item> <el-dropdown-item command="uigf-json">{{ui.button.uigf}}</el-dropdown-item>
<el-dropdown-item command="import-json" divided>{{ui.button.import}}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</template> </template>
</el-dropdown> </el-dropdown>
<el-button @click="importData()" icon="upload" class="focus:outline-none" type="success" plain>{{ui.button.import}}</el-button>
<el-tooltip v-if="detail && state.status !== 'loading'" :content="ui.hint.newAccount" placement="bottom"> <el-tooltip v-if="detail && state.status !== 'loading'" :content="ui.hint.newAccount" placement="bottom">
<el-button @click="newUser()" plain icon="plus" class="focus:outline-none"></el-button> <el-button @click="newUser()" plain icon="plus" class="focus:outline-none"></el-button>
</el-tooltip> </el-tooltip>
@ -290,8 +290,6 @@ const exportCommand = (type) => {
saveExcel() saveExcel()
} else if (type === 'uigf-json') { } else if (type === 'uigf-json') {
exportUIGFJSON() exportUIGFJSON()
} else if (type === 'import-json') {
importData()
} }
} }
const openCacheFolder = async () => { const openCacheFolder = async () => {

@ -5205,10 +5205,10 @@ window-size@^1.1.1:
define-property "^1.0.0" define-property "^1.0.0"
is-number "^3.0.0" is-number "^3.0.0"
winreg@1.2.4: winreg@^1.2.4:
version "1.2.4" version "1.2.4"
resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b" resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b"
integrity sha512-IHpzORub7kYlb8A43Iig3reOvlcBJGX9gZ0WycHhghHtA65X0LYnMRuJs+aH1abVnMJztQkvQNlltnbPi5aGIA== integrity sha1-ugZWKbepJRMOFXeRCM9UCZDpjRs=
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0" version "7.0.0"
@ -5326,4 +5326,4 @@ zrender@5.2.1:
resolved "https://registry.npmmirror.com/zrender/download/zrender-5.2.1.tgz#5f4bbda915ba6d412b0b19dc2431beaad05417bb" resolved "https://registry.npmmirror.com/zrender/download/zrender-5.2.1.tgz#5f4bbda915ba6d412b0b19dc2431beaad05417bb"
integrity sha1-X0u9qRW6bUErCxncJDG+qtBUF7s= integrity sha1-X0u9qRW6bUErCxncJDG+qtBUF7s=
dependencies: dependencies:
tslib "2.3.0" tslib "2.3.0"