gemercheung 2 سال پیش
والد
کامیت
60aca4e156

+ 8 - 10
packages/qjkankan-editor/src/components/sceneGroupInEditor.vue

@@ -29,21 +29,14 @@
         class="iconfont icon-editor_folder_off folder_collapsed"
       ></i>
       <template v-if="!isRenaming">
-        <span
-          class="group-name"
-          v-title="
-            $i18n.t(`zh_key.${groupNode.name}`).indexOf('zh_key') > -1
-              ? groupNode.name
-              : $i18n.t(`zh_key.${groupNode.name}`)
-          "
-        >
+        <span class="group-name" v-title="groupLv1name(groupNode.name)">
           <!-- {{
             $i18n.t(`zh_key.${groupNode.name}`).indexOf("zh_key") > -1
               ? groupNode.name
               : $i18n.t(`zh_key.${groupNode.name}`)
           }} -->
-          {{ groupNode.name }}
-          xxxx
+          {{ groupLv1name(groupNode.name) }}
+   
         </span>
         <i
           v-show="level === 1"
@@ -230,6 +223,11 @@ export default {
     };
   },
   computed: {
+    groupLv1name() {
+      return (name) => {
+        return name && name.length ? name :this.$i18n.t('navigation.group_one');
+      };
+    },
     ...mapGetters({
       info: "info",
       dragInfo: "editorNavDragInfo",

+ 2 - 1
packages/qjkankan-editor/src/core/hotspot.js

@@ -37,10 +37,11 @@ const initState = {
 const convertBaseStyle = (dest, origin) => {
     if (dest) {
         // normal
+
         dest.style.fontSize = origin.fontSize
         dest.style.position = origin.titlePosition
         // 兼容旧数据
- 
+
         if ('visible' in origin && typeof origin.visible == "boolean") {
             dest.visible = origin.visible ? 0 : 1
             origin.titleDisplayMode = origin.visible ? 'always' : 'never'

+ 4 - 2
packages/qjkankan-editor/src/core/utils.js

@@ -69,10 +69,11 @@ export default class Utils {
 
       const hotspotSize = (Number(hotspot.size) || 1) * 40;
       let icon = hotspot.icon.replace(/,/g, '|');
+      let title = this.htmlEncode(hotspot.title);
       const callString = `editJQHotspot(
         ${hotspot.id},
         ${hotspot.type},
-        ${hotspot.title},
+        ${title},
         "${icon}",
         ${hotspot.ath},
         ${hotspot.atv},
@@ -108,10 +109,11 @@ export default class Utils {
       const ath = hotspot.ath != '' ? hotspot.ath : krpano.get("curscreen_ath");
       const atv = hotspot.atv != '' ? hotspot.atv : krpano.get("curscreen_atv");
       let icon = hotspot.icon.replace(/,/g, '|');
+      let title = this.htmlEncode(hotspot.title);
       const callString = `addJQHotspot(
         ${hotspot.id},
         ${hotspot.type},
-        ${hotspot.title},
+        ${title},
         "${icon}",
         ${ath},
         ${atv},

+ 22 - 14
packages/qjkankan-editor/src/lang/_en.json

@@ -740,25 +740,33 @@
     "no_display": "(No display)",
     "second": " Sec"
   },
+  "table": {
+    "material": "Material",
+    "name": "Title",
+    "fileSize": "Size",
+    "detail": "Resolution",
+    "createTime": "Created",
+    "updateTime": "Modified"
+  },
   "baseSetting": {
     "电话": "Tel",
     "链接": "Link",
     "弹出层打开": "Pop-up Notification",
     "新窗口打开": "New Tab",
-    "小行星开场": "Start with asteroid",
-    "小行星巡游开场": "Start with asteroid cruise",
-    "小行星缩放开场": "Start with asteroid zoom",
-    "水平巡游开场": "Start with horizontal cruise",
-    "水晶球开场": "Start with crystal ball",
-    "开场提示": "Notifications",
-    "开场动画": "Animations",
-    "访问密码": "Access Code",
-    "自动巡游": "Rotation",
-    "背景音乐": "BGM",
-    "自定义LOGO": "Custom Logo",
-    "自定义遮罩": "Custom Mask",
-    "自定义按钮": "Custom Button",
-    "开场封面": "Opening Cover",
+    "opa1": "Start with asteroid",
+    "opa2": "Start with asteroid cruise",
+    "opa3": "Start with asteroid zoom",
+    "opa4": "Start with horizontal cruise",
+    "opa5": "Start with crystal ball",
+    "openTips": "Notifications",
+    "openAnimate": "Animations",
+    "password": "Access Code",
+    "cruise": "Rotation",
+    "bgm": "BGM",
+    "logo": "Custom Logo",
+    "customCover": "Custom Mask",
+    "customButton": "Custom Button",
+    "openCover": "Opening Cover",
     "素材": "Material",
     "名称": "Title",
     "大小": "Size",

+ 1 - 11
packages/qjkankan-editor/src/lang/_zh.json

@@ -750,10 +750,6 @@
     "updateTime": "修改时间"
   },
   "baseSetting": {
-    "电话": "电话",
-    "链接": "链接",
-    "弹出层打开": "弹出层打开",
-    "新窗口打开": "新窗口打开",
     "opa1": "小行星开场",
     "opa2": "小行星巡游开场",
     "opa3": "小行星缩放开场",
@@ -767,13 +763,7 @@
     "logo": "自定义LOGO",
     "customCover": "自定义遮罩",
     "customButton": "自定义按钮",
-    "openCover": "开场封面",
-    "封面": "封面",
-    "场景标题": "场景标题",
-    "拍摄时间": "拍摄时间",
-    "一级分组": "一级分组",
-    "二级分组": "二级分组",
-    "默认二级分组": "默认二级分组"
+    "openCover": "开场封面"
   },
   "customButton": {
     "phone": "电话",