浏览代码

Merge branch 'v1.9.0-jm-local' of http://192.168.0.115:3000/bill/fuse-code into v1.9.0-jm-local

xzw 2 月之前
父节点
当前提交
656ae83d8a
共有 4 个文件被更改,包括 14 次插入11 次删除
  1. 2 2
      src/hook/use-pixel.ts
  2. 1 1
      src/model/platform.ts
  3. 10 7
      src/views/guide/guide/sign.vue
  4. 1 1
      vite.config.ts

+ 2 - 2
src/hook/use-pixel.ts

@@ -41,10 +41,10 @@ export const usePixel = (
   const [pixel, pause, recovery] = useCameraChange(getPosStyle);
 
   useViewStack(() => {
-    watch(getter, (val) => (pos.value = val));
+    watch(getter, (val) => pos.value = val);
     return watch(pos, () => {
       pixel.value = getPosStyle()
-    }, { deep: true });
+    }, { deep: true, immediate: true });
   });
 
   return [pixel, pos, pause, recovery] as const;

+ 1 - 1
src/model/platform.ts

@@ -40,7 +40,7 @@ export async function modelSDKFactory(
       await initialSDK({
         laserRoot: offline ? offlinePrev : params.laserRoot,
         // panoOSSRoot: offline ? offlinePrev : params.panoOSSRoot,
-        ossRoot: offline ? offlinePrev : params.ossRoot,
+        ossRoot: offline ? 'oss/' : params.ossRoot,
         // laserOSSRoot: offline ? offlinePrev : params.laserOSSRoot,
         layout: dom,
         scenes: scenes.value,

+ 10 - 7
src/views/guide/guide/sign.vue

@@ -18,7 +18,8 @@
           type="text"
           :modelValue="guide.title"
           :maxlength="15"
-          @update:modelValue="(title: string) => $emit('updateTitle', title.trim())"
+          @update:modelValue="(title: string) => $emit('updateTitle', title)"
+          @blur="() => $emit('updateTitle', guide.title.trim())"
           v-show="isEditTitle"
           ref="inputRef"
           height="28px"
@@ -53,9 +54,9 @@ const props = withDefaults(defineProps<{ guide: Guide; edit?: boolean }>(), {
 const inputRef = ref();
 const isEditTitle = useFocus(computed(() => inputRef.value?.vmRef.root));
 watchEffect(() => {
-  if (!isEditTitle.value && !props.guide.title.length) {
+  if (!isEditTitle.value && !props.guide.title.trim().length) {
     isEditTitle.value = true;
-    Message.warning(ui18n.t('guide.nameErr'));
+    Message.warning(ui18n.t("guide.nameErr"));
   }
 });
 
@@ -67,9 +68,9 @@ const emit = defineEmits<{
 }>();
 
 const menus = [
-  { label: ui18n.t('sys.rename'), value: "editTitle" },
-  { label: ui18n.t('sys.edit'), value: "edit" },
-  { label: ui18n.t('sys.del'), value: "delete" },
+  { label: ui18n.t("sys.rename"), value: "editTitle" },
+  { label: ui18n.t("sys.edit"), value: "edit" },
+  { label: ui18n.t("sys.del"), value: "delete" },
 ];
 const actions = {
   edit: () => emit("edit"),
@@ -108,7 +109,9 @@ const actions = {
 
     videoRecorder.on("record", (blob) => {
       saveAs(
-        new File([blob], ui18n.t('record.vName') + ".mp4", { type: "video/mp4; codecs=h264" }),
+        new File([blob], ui18n.t("record.vName") + ".mp4", {
+          type: "video/mp4; codecs=h264",
+        }),
         props.guide.title + ".mp4"
       );
     });

+ 1 - 1
vite.config.ts

@@ -4,7 +4,7 @@ import { createServer as createLangServer } from "./scripts/lang";
 import { resolve } from "path";
 
 const langProt = 7072;
-const ip = `http://192.168.0.62:9000`;
+const ip = `http://192.168.9.171:9000`;
 const proxy = {
   "/dev": {
     target: `http://localhost:${langProt}`,