完善翻译.设置自动获取IP时显示当前设备的网络信息

2022-07-11 17:38:44 +08:00 · 2022-07-11 17:38:44 +08:00 · 5ee06b380c
parent 41e5e90990
commit 5ee06b380c
10 changed files with 90 additions and 61 deletions
--- a/package.json
+++ b/package.json
@ -25,7 +25,6 @@
    "ts-md5": "^1.2.11",
    "update": "^0.7.4",
    "v-viewer": "^3.0.9",
-    "vconsole": "^3.14.6",
    "vue": "^3.0.0",
    "vue-i18n": "^9.1.9",
    "vue-router": "^4.0.0",
--- a/src/App.vue
+++ b/src/App.vue
@ -12,15 +12,6 @@ import { useI18n } from "vue-i18n";
 import EventBus, { EventNamesDefine } from "src/common/EventBus";
 import { useStore } from "src/store";

-import VConsole from "vconsole";
-
-// 根据条件加载 vConsole
-{
-  if (window.location.href.indexOf("__showDebug__=_1025_") != -1) {
-    new VConsole();
-  }
-}
-
 export default defineComponent({
  name: "App",

@ -59,19 +50,17 @@ export default defineComponent({
    }

    try {
-      {
-        const user_search = (<any>window).user_search || {};
-        if (typeof user_search == "object") {
-          $store.commit(
-            "setAvancedDebug",
-            typeof user_search["debug"] != "undefined"
-          );
+      const user_search = (<any>window).user_search || {};
+      if (typeof user_search == "object") {
+        $store.commit(
+          "setAvancedDebug",
+          typeof user_search["debug"] != "undefined"
+        );

-          $store.commit(
-            "setFactoryMode",
-            typeof user_search["factory"] != "undefined"
-          );
-        }
+        $store.commit(
+          "setFactoryMode",
+          typeof user_search["factory"] != "undefined"
+        );
      }
    } catch (e) {
      console.log(e);
--- a/src/components/BackgroundImageDialog.vue
+++ b/src/components/BackgroundImageDialog.vue
@ -65,6 +65,7 @@
        <q-card-actions align="left">
          <q-btn
            flat
+            no-caps
            :loading="loading"
            color="primary"
            @click="showBackgroundImage"
--- a/src/components/GridSettingDialog.vue
+++ b/src/components/GridSettingDialog.vue
@ -44,7 +44,7 @@
              <q-item-section>
                <q-select
                  :label="$t('wall row')"
-                  :hint="$t('please input') + $t('wall row') + ':'"
+                  :hint="$t('please input ') + $t('wall row') + ':'"
                  :options="select_options"
                  v-model="rows"
                >
@ -55,7 +55,7 @@
              <q-item-section>
                <q-select
                  :label="$t('wall col')"
-                  :hint="$t('please input') + $t('wall col') + ':'"
+                  :hint="$t('please input ') + $t('wall col') + ':'"
                  :options="select_options"
                  v-model="cols"
                >
--- a/src/components/SignalSourceDialog.vue
+++ b/src/components/SignalSourceDialog.vue
@ -12,7 +12,7 @@
    "
  >
    <q-card class="overflow-hidden" style="overflow-y: scroll; max-width: 45vw">
-      <q-form @submit="onSubmit">
+      <q-form ref="signal_source_form" @submit="onSubmit">
        <q-card-section class="q-ma-none q-pa-sm">
          <div class="row">
            <div class="col-auto text-h6">
@ -175,12 +175,12 @@
                    media_url_label.startsWith($t('file path'))
                      ? $t('dbclick select file')
                      : media_url_label.startsWith($t('clock'))
-                      ? $t('dbclick config') + $t('clock')
+                      ? $t('dbclick config ') + $t('clock')
                      : media_url_label.startsWith($t('weather'))
-                      ? $t('dbclick config') + $t('weather')
+                      ? $t('dbclick config ') + $t('weather')
                      : media_url_label.startsWith($t('timer'))
-                      ? $t('dbclick config') + $t('timer')
-                      : $t('please input') +
+                      ? $t('dbclick config ') + $t('timer')
+                      : $t('please input ') +
                        media_url_label.substr(0, media_url_label.length - 1)
                  "
                  lazy-rules
@ -189,7 +189,19 @@
                      (val && val.length > 0) ||
                      $t('Please type something') +
                        ',' +
-                        $t('dbclick select file'),
+                        (media_url_label.startsWith($t('file path'))
+                          ? $t('dbclick select file')
+                          : media_url_label.startsWith($t('clock'))
+                          ? $t('dbclick config ') + $t('clock')
+                          : media_url_label.startsWith($t('weather'))
+                          ? $t('dbclick config ') + $t('weather')
+                          : media_url_label.startsWith($t('timer'))
+                          ? $t('dbclick config ') + $t('timer')
+                          : $t('please input ') +
+                            media_url_label.substr(
+                              0,
+                              media_url_label.length - 1
+                            )),
                  ]"
                  @keydown="
                    (evt) => {
@ -360,6 +372,7 @@ export default defineComponent({
    let weather_dialog: any = ref(null);
    let timer_dialog: any = ref(null);
    let file_manage_dialog: any = ref(null);
+    const signal_source_form: any = ref(null);

    let suppored_window_types = new Set<string>([
      "EwindowType::Multimedia",
@ -603,6 +616,8 @@ export default defineComponent({
      weather_dialog,
      timer_dialog,
      file_manage_dialog,
+      signal_source_form,
+
      showDialog(options: any) {
        if (options) {
          type.value = options.type ?? 1;
@ -635,6 +650,9 @@ export default defineComponent({
        return node.is_group && !node.item_data?.system_default;
      },
      onSelected(value: any) {
+        if (signal_source_form.value) {
+          signal_source_form.value.resetValidation();
+        }
        setMediaUrlLabel(value as string);
      },
      async onSubmit() {
--- a/src/components/SystemSettingDialog.vue
+++ b/src/components/SystemSettingDialog.vue
@ -83,6 +83,7 @@
          <q-tab
            v-if="function_output_board_attribute"
            name="output_board"
+            no-caps
            icon="save"
            :label="$t('output board setting')"
            :disable="loading"
@ -109,7 +110,10 @@
                        />
                      </q-item-section>
                    </q-item>
-                    <q-item class="q-pa-none" v-if="auto_ip != $t('enable')">
+                    <q-item
+                      class="q-pa-none"
+                      v-if="true || auto_ip != $t('enable')"
+                    >
                      <q-item-section avatar class="width_5_1">{{
                        $t("ip address") + ":"
                      }}</q-item-section>
@ -131,7 +135,10 @@
                        />
                      </q-item-section>
                    </q-item>
-                    <q-item class="q-pa-none" v-if="auto_ip != $t('enable')">
+                    <q-item
+                      class="q-pa-none"
+                      v-if="true || auto_ip != $t('enable')"
+                    >
                      <q-item-section avatar class="width_5_1">{{
                        $t("gateway") + ":"
                      }}</q-item-section>
@ -153,7 +160,10 @@
                        />
                      </q-item-section>
                    </q-item>
-                    <q-item class="q-pa-none" v-if="auto_ip != $t('enable')">
+                    <q-item
+                      class="q-pa-none"
+                      v-if="true || auto_ip != $t('enable')"
+                    >
                      <q-item-section avatar class="width_5_1">{{
                        $t("netmask") + ":"
                      }}</q-item-section>
@ -961,6 +971,7 @@
                        <q-item-section>
                          <q-btn
                            class="q-mx-xl"
+                            no-caps
                            :label="$t('restore output board')"
                            @click="restoreOutputBoard"
                          ></q-btn>
--- a/src/components/UpgradeDialog.vue
+++ b/src/components/UpgradeDialog.vue
@ -44,7 +44,7 @@
              <q-item-section>
                <q-select
                  :label="$t('upgrade type')"
-                  :hint="$t('please input') + $t('upgrade type') + ':'"
+                  :hint="$t('please input ') + $t('upgrade type') + ':'"
                  :options="select_options"
                  v-model="upgrade_type"
                  @update:model-value="file_count = 0"
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@ -4,8 +4,8 @@
 export default {
  " ": " ",
  title: "MediaPlayerWebAPP",
-  failed: " failed",
-  success: " successful",
+  failed: " Failed",
+  success: " Successful",
  CN_BERWEEN_SUFFIX: "",
  "clean screen": "Clear",
  "full screen window": "Maximize",
@ -185,7 +185,7 @@ export default {
  "timing cycle": "Timing Exexute",
  monday: "Monday",
  tuesday: "Turesday",
-  wednsday: "Wednsday",
+  wednesday: "Wednesday",
  thursday: "Thursday",
  friday: "Friday",
  saturday: "Saturday",
@ -257,4 +257,35 @@ export default {
  "network disconnect!": "Network Disconnect!",
  "wait reconnection": "Wait Reconnection",
  "back to login page": "Back To Login Page",
+  "Please type something": "Please Type Something",
+  "please input group name": "Please Input Group Name",
+  "graphics setting": "Graphics Setting",
+  "output board setting": "Output Board Setting",
+  splicing: "Splicing",
+  "horizon blanking": "Horizon Blanking",
+  "vertical blanking": "Vertical Blanking",
+  "output board resolution": "Output Board Resolution",
+  volume: "Volume",
+  rotate: "Rotate",
+  "restore output board": "Restore Output Board",
+  "please input ": "Please Input ",
+  "please input mode name": "Please Input Mode Name",
+  "please input mode index": "Please Inpout Mode Index",
+  "please input plan name": "Please Input Mode Plan Name",
+  "please input signal source name": "Please Input Signal Name",
+  "please select signal source type": "Please Select Signal Type",
+  "dbclick select file": "DBClick Select File",
+  "dbclick config ": "DBClick Config ",
+  "please input task name": "Please Input Task Name",
+  on: "On",
+  off: "Off",
+  "select background image": "Select Background Image",
+  "view current background image": "View Current Background Image",
+  "background image": "Background",
+  "force output": "Force Output",
+  custom: "Custom",
+  unknow: "UnKnow",
+  click: "Click",
+  "lossless ": "Lossless ",
+  "picture quality": "Picture Quality",
 };
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@ -66,7 +66,7 @@ export default {
  rtsp: "网络视频",
  "media url": "媒体 RUL",
  "please input media url": "请输入媒体 RUL",
-  "please input": "请输入",
+  "please input ": "请输入",
  "http url": "HTTP超链接",
  "RTSP url": "网络地址",
  "file path": "文件路径",
@ -559,7 +559,7 @@ export default {
  chinese: "中文",
  "hour mark color": "时标",
  timer: "计时器",
-  "dbclick config": "双击配置",
+  "dbclick config ": "双击配置",
  "timer setting": "计时器设置",
  "timer type": "计时器类型",
  "forward timer": "正计时",
--- a/yarn.lock
+++ b/yarn.lock
@ -934,7 +934,7 @@
    "@babel/types" "^7.4.4"
    esutils "^2.0.2"

-"@babel/runtime@^7.11.2", "@babel/runtime@^7.17.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.0":
+"@babel/runtime@^7.11.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.0":
  version "7.18.3"
  resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.18.3.tgz#c7b654b57f6f63cf7f8b418ac9ca04408c4579f4"
  integrity sha512-38Y8f7YUhce/K7RMwTp7m0uCumpv9hZkitCbBClqQIow1qSbCvGkcegKOXpEWCQLfWmevgRiWokZ1GkpfhbZug==
@ -3708,11 +3708,6 @@ copy-task@^0.1.0:
  resolved "https://registry.npmmirror.com/copy-task/-/copy-task-0.1.0.tgz#4c34fe9ae54f2aaf609ed32f85b8f797a1f46ab6"
  integrity sha512-Idcf7BdeyJY8kSQodguY8jevkP8CuB22S9Hr5blRqwEyO75yuZEJQbzJ755Q9vZREnCQ5sfOIRxjZWbUq2+K0g==

-copy-text-to-clipboard@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.0.1.tgz#8cbf8f90e0a47f12e4a24743736265d157bce69c"
-  integrity sha512-rvVsHrpFcL4F2P8ihsoLdFHmd404+CMg71S756oRSeQgqk51U3kicGdnvfkrxva0xXH92SjGS62B0XIJsbh+9Q==
-
 copy-webpack-plugin@10.2.4:
  version "10.2.4"
  resolved "https://registry.npmmirror.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz#6c854be3fdaae22025da34b9112ccf81c63308fe"
@ -3733,7 +3728,7 @@ core-js-compat@^3.21.0, core-js-compat@^3.22.1, core-js-compat@^3.6.5:
    browserslist "^4.20.4"
    semver "7.0.0"

-core-js@^3.11.0, core-js@^3.21.0, core-js@^3.6.5:
+core-js@^3.21.0, core-js@^3.6.5:
  version "3.23.0"
  resolved "https://registry.npmmirror.com/core-js/-/core-js-3.23.0.tgz#9e33448c8fd3b02ad023d85bd6e85da6335b5cc4"
  integrity sha512-v2/hZoRcRrvQiBoGsHwmRdr+S4oICKcjA6xb2qjVurin6TpcDC1X2CIDa8rdu/d5n8RT/Sdoos2IlnpQ1rXs5A==
@ -7776,11 +7771,6 @@ multimatch@^5.0.0:
    arrify "^2.0.1"
    minimatch "^3.0.4"

-mutation-observer@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz#42e9222b101bca82e5ba9d5a7acf4a14c0f263d0"
-  integrity sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA==
-
 mute-stream@0.0.5:
  version "0.0.5"
  resolved "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
@ -10932,16 +10922,6 @@ vary@^1, vary@~1.1.2:
  resolved "https://registry.npmmirror.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==

-vconsole@^3.14.6:
-  version "3.14.6"
-  resolved "https://registry.npmmirror.com/vconsole/-/vconsole-3.14.6.tgz#74cbbf9c14e66d26325958cee8a9e8c4086a5115"
-  integrity sha512-8Ffk2SfNe6EzKqZ0aNnNjpAVBVT7zgJo81lYEJdKySYLVYBeSawdSkWi9fSjDg3WsQhgS1vNPmRqJDTuwdVbnQ==
-  dependencies:
-    "@babel/runtime" "^7.17.2"
-    copy-text-to-clipboard "^3.0.1"
-    core-js "^3.11.0"
-    mutation-observer "^1.0.3"
-
 viewerjs@^1.9.0:
  version "1.10.5"
  resolved "https://registry.npmmirror.com/viewerjs/-/viewerjs-1.10.5.tgz#a0f52fe7c15fa27003099af8e7552378ed5fc94d"