gemercheung 2 years ago
parent
commit
9df3ad7126

+ 1 - 1
packages/qjkankan-editor/public/edit.html

@@ -11,7 +11,7 @@
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontVR/iconfont.css"/>
     <link rel="stylesheet" href="//at.alicdn.com/t/font_2410347_3sp3zd6hsff.css"/> -->
     
-    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_2625385_1un5khf0xqy.css"/>
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_2625385_h1q9uyoxhsd.css"/>
 
   
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/quill/quill.snow.css" />

+ 1 - 1
packages/qjkankan-editor/public/material.html

@@ -10,7 +10,7 @@
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/iconfontQJ1.1.0/iconfont.css"/>
     <link rel="stylesheet" href="//at.alicdn.com/t/font_2947721_fdnuf7rzr.css"/> -->
 
-    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_2625385_1un5khf0xqy.css"/>
+    <link rel="stylesheet" href="//at.alicdn.com/t/c/font_2625385_h1q9uyoxhsd.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/animate/animate.min.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/mCustomScrollbar/jquery.mCustomScrollbar.min.css"/>
     <link rel="stylesheet" href="<%= VUE_APP_STATIC_DIR %>/lib/scrollbar/perfect-scrollbar.css"/>

+ 3 - 2
packages/qjkankan-editor/src/components/NestedFolder.vue

@@ -11,7 +11,6 @@
         paddingLeft: topBarPaddingLeft,
       }"
     >
-     
       <i
         class="iconfont icon-edit_input_arrow icon-expand"
         :class="isExpanded ? '' : 'collapsed'"
@@ -31,7 +30,9 @@
         draggable="false"
       />
       <span class="group-name">{{
-        folderInfo.id === 1 ? $i18n.t("gather.root_dir") : folderInfo.name
+        folderInfo.id === 1
+          ? $i18n.t("gather.root_dir")
+          : folderInfo.name
       }}</span>
     </div>
 

+ 1 - 0
packages/qjkankan-editor/src/components/insertPositionTipInEditor.vue

@@ -240,6 +240,7 @@ export default {
             const draggedGroup = this.info.catalogs.find((item) => {
               return item.id === this.dragInfo.node.id
             })
+            
             draggedGroup.name = '默认二级分组'
 
             /**

+ 19 - 2
packages/qjkankan-editor/src/components/sceneGroupInEditor.vue

@@ -29,13 +29,14 @@
         class="iconfont icon-editor_folder_off folder_collapsed"
       ></i>
       <template v-if="!isRenaming">
-        <span class="group-name" v-title="groupLv1name(groupNode.name)">
+        <span class="group-name" v-title="transTitle(groupNode.name)">
           <!-- {{
             $i18n.t(`zh_key.${groupNode.name}`).indexOf("zh_key") > -1
               ? groupNode.name
               : $i18n.t(`zh_key.${groupNode.name}`)
           }} -->
-          {{ groupLv1name(groupNode.name) }}
+          {{ transTitle(groupNode.name) }}
+          <!-- {{ groupLv1name(groupNode.name) }} -->
         </span>
         <i
           v-show="level === 1"
@@ -223,6 +224,22 @@ export default {
     };
   },
   computed: {
+    transTitle() {
+      return (name) => {
+        switch (name) {
+          case "默认一级分组":
+            return this.$i18n.t("navigation.default_group_one");
+          case "默认二级分组":
+            return this.$i18n.t("navigation.default_group_two");
+          case "一级分组":
+            return this.$i18n.t("navigation.group_one");
+          case "二级分组":
+            return this.$i18n.t("navigation.group_two");
+          default:
+            return name;
+        }
+      };
+    },
     groupLv1name() {
       return (name) => {
         return name && name.length

+ 3 - 19
packages/qjkankan-editor/src/lang/_en.json

@@ -752,10 +752,6 @@
     "updateTime": "Modified"
   },
   "baseSetting": {
-    "电话": "Tel",
-    "链接": "Link",
-    "弹出层打开": "Pop-up Notification",
-    "新窗口打开": "New Tab",
     "opa1": "Start with asteroid",
     "opa2": "Start with asteroid cruise",
     "opa3": "Start with asteroid zoom",
@@ -769,19 +765,7 @@
     "logo": "Custom Logo",
     "customCover": "Custom Mask",
     "customButton": "Custom Button",
-    "openCover": "Opening Cover",
-    "素材": "Material",
-    "名称": "Title",
-    "大小": "Size",
-    "分辨率": "Resolution",
-    "创建时间": "Created",
-    "修改时间": "Modified",
-    "封面": "Cover",
-    "场景标题": "Scene Title",
-    "拍摄时间": "Shooting Time",
-    "一级分组": "1st Grouping",
-    "二级分组": "2nd Grouping",
-    "默认二级分组": "Default as 2nd grouping"
+    "openCover": "Opening Cover"
   },
   "customButton": {
     "phone": "Tel",
@@ -924,8 +908,8 @@
     "add_article": "Add Paragraph",
     "edit_article_title": "Edit paragraph",
     "edit_article": "Edit paragraph",
-    "edit_text_title": "编辑文本",
-    "edit_text": "编辑文本内容",
+    "edit_text_title": "Edit text",
+    "edit_text": "Edit text Content",
     "cancel_add_hotspot": "The edited content will not be saved, confirm to close it"
   },
   "explanation": {