automatic merge to finish v1.0.3

cars10 · Jan 13, 2024 · d3d6338 · d3d6338
2 parents 83d3c64 + 9bb017b
commit d3d6338
Show file tree

Hide file tree

Showing 16 changed files with 208 additions and 326 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -89,18 +89,6 @@ jobs:
  with:
  path: src-tauri/target/release/elasticvue.exe
 
- build_browser_extensions:
- name: Build browser extensions
- runs-on: ubuntu-latest
- steps:
- - uses: actions/checkout@v3
- - run: make build_browser_extensions
-
- - name: upload extensions
- uses: actions/upload-artifact@v3
- with:
- path: artifacts/*.zip
-
  build_docker:
  name: Build docker images
  runs-on: ubuntu-latest
@@ -136,7 +124,6 @@ jobs:
  name: Publish release
  needs:
  - build_desktop
- - build_browser_extensions
  - build_docker
  runs-on: ubuntu-latest
  steps:
@@ -153,7 +140,7 @@ jobs:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  with:
  draft: true
- prerelease: true
+ prerelease: false
  tag: ${{ github.ref_name }}
  name: ${{ github.ref_name }}
  artifacts: github-artifacts/artifact/*

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/browser_extension/chrome/manifest.json b/browser_extension/chrome/manifest.json
@@ -1,6 +1,6 @@
 {
  "name": "Elasticvue",
- "version": "1.0.2",
+ "version": "1.0.3",
  "description": "Elasticsearch frontend",
  "manifest_version": 3,
  "icons": {

diff --git a/browser_extension/firefox/manifest.json b/browser_extension/firefox/manifest.json
@@ -1,6 +1,6 @@
 {
  "name": "Elasticvue",
- "version": "1.0.2",
+ "version": "1.0.3",
  "description": "Elasticsearch frontend",
  "manifest_version": 2,
  "icons": {

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "elasticvue",
  "private": true,
- "version": "1.0.2",
+ "version": "1.0.3",
  "scripts": {
  "dev": "vite",
  "build": "vite build",

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
  "package": {
  "productName": "elasticvue",
- "version": "1.0.2"
+ "version": "1.0.3"
  },
  "build": {
  "distDir": "../dist",

diff --git a/src/autocomplete.ts b/src/autocomplete.ts
@@ -5,7 +5,7 @@ export const queryKeywords = [
  'fields', 'type',
  'filter', 'boost',
  'operator', 'cutoff_frequency', 'bool', 'must', 'should', 'term', 'terms', 'prefix',
- 'query', 'match', 'match_phrase', 'range', 'gte', 'lte',
+ 'query', 'query_string', 'match', 'match_phrase', 'range', 'gte', 'lte',
  '_source'
 ]
 

diff --git a/src/components/base/LanguageSwitcher.vue b/src/components/base/LanguageSwitcher.vue
@@ -28,9 +28,6 @@
  </q-list>
  </q-menu>
  </q-btn>
-
- <a v-if="store.language === 'cn'" class="q-px-md" target="_blank"
- href="https://github.com/cars10/elasticvue/wiki/Help-translating-elasticvue">帮忙翻译elasticvue</a>
 </template>
 
 <script setup lang="ts">

diff --git a/src/components/nodes/NodePercentProgress.vue b/src/components/nodes/NodePercentProgress.vue
@@ -1,17 +1,16 @@
 <template>
- <q-linear-progress :value="numValue / 100" :color="color" />
+ <q-linear-progress :value="props.value / 100" :color="color" />
 </template>
 
 <script setup lang="ts">
  import { computed } from 'vue'
 
- const props = defineProps<{ value: string }>()
- const numValue = computed(() => (parseFloat(props.value)))
+ const props = defineProps<{ value: number }>()
 
  const color = computed(() => {
- if (numValue.value >= 90) {
+ if (props.value >= 90) {
  return 'negative'
- } else if (numValue.value < 90 && numValue.value >= 80) {
+ } else if (props.value < 90 && props.value >= 80) {
  return 'warning'
  } else {
  return 'primary-dark'

diff --git a/src/components/nodes/NodesTable.vue b/src/components/nodes/NodesTable.vue
@@ -100,7 +100,7 @@
  { label: t('cluster_nodes.node_properties.master'), field: 'master', align: 'left' },
  { label: t('cluster_nodes.node_properties.node_role'), field: 'nodeRole', align: 'left' },
  { label: t('cluster_nodes.node_properties.attr'), align: 'left' },
- { label: t('cluster_nodes.node_properties.load'), field: 'load_1m', align: 'left' },
+ { label: t('cluster_nodes.node_properties.load'), align: 'left' },
  { label: t('cluster_nodes.node_properties.cpu'), field: 'cpu', align: 'left' },
  { label: t('cluster_nodes.node_properties.ram'), field: 'ramPercent', align: 'left' },
  { label: t('cluster_nodes.node_properties.heap'), field: 'heapPercent', align: 'left' },

diff --git a/src/components/settings/GlobalSettings.vue b/src/components/settings/GlobalSettings.vue
@@ -31,7 +31,6 @@
  <div class="row q-mb-lg">
  <div class="col-md-6 col-sm-12">
  <q-input v-model="nodesStore.hideAttributesRegex"
- autofocus
  outlined
  :label="t('settings.hide_nodes_attributes_regex.label')"
  :hint="t('settings.hide_nodes_attributes_regex.message')">

diff --git a/src/composables/CodeEditor.ts b/src/composables/CodeEditor.ts
@@ -24,6 +24,8 @@ import { queryKeywords, queryValues } from '../autocomplete.ts'
  */
 const completions = (context: any) => {
  const word = context.matchBefore(/\w*/)
+ if (!context.explicit) return null
+
  const nodeBefore = syntaxTree(context.state).resolveInner(context.pos, -1)
  if (nodeBefore.name === 'Property') {
  return {

diff --git a/src/composables/components/rest/RestQueryForm.ts b/src/composables/components/rest/RestQueryForm.ts
@@ -128,7 +128,7 @@ export const useRestQueryForm = (props: RestQueryFormProps, emit: any) => {
  })
 
  const editorCommands = [{
- key: 'Ctrl-Enter', mac: 'Cmd-Enter', run: () => {
+ key: 'Ctrl-Enter', run: () => {
  sendRequest()
  return true
  }

diff --git a/src/composables/components/search/SearchDocuments.ts b/src/composables/components/search/SearchDocuments.ts
@@ -70,7 +70,7 @@ export const useSearchDocuments = () => {
  }
 
  const editorCommands = [{
- key: 'Alt-Enter', mac: 'Cmd-Enter', run: () => {
+ key: 'Ctrl-Enter', run: () => {
  search()
  return true
  }