Merge branch 'dev' of http://192.168.0.115:3000/bill/fuse-code into dev

package.json

@@ -9,7 +9,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@simaq/core": "^1.1.0",
+    "@simaq/core": "1.1.6",
     "ant-design-vue": "^3.3.0-beta.3",
     "axios": "^0.27.2",
     "less": "^4.1.3",

pnpm-lock.yaml

@@ -1,7 +1,7 @@
 lockfileVersion: 5.4
 
 specifiers:
-  '@simaq/core': ^1.1.0
+  '@simaq/core': 1.1.6
   '@types/node': ^18.6.5
   '@vitejs/plugin-vue': ^3.0.0
   ant-design-vue: ^3.3.0-beta.3
@@ -19,7 +19,7 @@ specifiers:
   vuedraggable: ^4.1.0
 
 dependencies:
-  '@simaq/core': 1.1.0
+  '@simaq/core': 1.1.6
   ant-design-vue: 3.3.0-beta.3_vue@3.2.37
   axios: 0.27.2
   less: 4.1.3
@@ -219,11 +219,11 @@ packages:
       '@octokit/openapi-types': 14.0.0
     dev: false
 
-  /@simaq/core/1.1.0:
-    resolution: {integrity: sha512-GzeaqGJv08eaaTDRpiTGpCu4jL3ZK8YcyQ9LxpsIOw8FqKd5V8ISsKivdiu1ti4Z6oWYYZSK3OLZ4RG7b57FqQ==}
+  /@simaq/core/1.1.6:
+    resolution: {integrity: sha512-V7Cm7Fyc0o6QJZ6rYcBKHnbadzi4+IMZR05atb/R0cZvLyIxa7+NEIp5hMa+KTzkgl+6OutvugC/GTUdxnWIyA==}
     dependencies:
       eventemitter3: 4.0.7
-      rxjs: 7.5.6
+      rxjs: 7.5.7
     dev: false
 
   /@simonwep/pickr/1.8.2:
@@ -403,7 +403,7 @@ packages:
   /axios/0.21.4_debug@4.3.4:
     resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
     dependencies:
-      follow-redirects: 1.15.1
+      follow-redirects: 1.15.1_debug@4.3.4
     transitivePeerDependencies:
       - debug
     dev: false
@@ -411,7 +411,7 @@ packages:
   /axios/0.27.2:
     resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
     dependencies:
-      follow-redirects: 1.15.1
+      follow-redirects: 1.15.1_debug@4.3.4
       form-data: 4.0.0
     transitivePeerDependencies:
       - debug
@@ -722,7 +722,7 @@ packages:
     dependencies:
       to-regex-range: 5.0.1
 
-  /follow-redirects/1.15.1:
+  /follow-redirects/1.15.1_debug@4.3.4:
     resolution: {integrity: sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==}
     engines: {node: '>=4.0'}
     peerDependencies:
@@ -730,6 +730,8 @@ packages:
     peerDependenciesMeta:
       debug:
         optional: true
+    dependencies:
+      debug: 4.3.4
     dev: false
 
   /form-data/4.0.0:
@@ -1010,8 +1012,8 @@ packages:
     optionalDependencies:
       fsevents: 2.3.2
 
-  /rxjs/7.5.6:
-    resolution: {integrity: sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==}
+  /rxjs/7.5.7:
+    resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
       tslib: 2.4.0
     dev: false

src/views/guide/sign.vue

@@ -54,10 +54,17 @@ const actions = {
   delete: () => emit('delete'),
   download: () => {
     const config: any = {
-      uploadUrl: '',
+      // uploadUrl: '',
+      // resolution: '4k',
+      // autoDownload: false,
+      // systemAudio: true,
+      // debug: true,
       resolution: '4k',
       autoDownload: false,
-      debug: false,
+      platform: 'web',
+      disbaledAudio: false,
+      systemAudio: false,
+      debug: true,
     }
   
     const videoRecorder = new VideoRecorder(config);

src/views/record/index.vue

@@ -33,8 +33,14 @@ import { RightFillPano } from '@/layout'
 import Draggable from 'vuedraggable'
 import Sign from './sign.vue'
 import { Dialog } from 'bill/index'
+import { initialTaggings } from '@/store/tagging'
+import { initialMeasures } from '@/store/measure'
+import { initialGuides } from '@/store/guide'
 
 initialRecords()
+initialTaggings()
+initialMeasures()
+initialGuides()
 
 const start = () => records.value.push(createRecord())
 const deleteRecord = async (record: Record) => {

src/views/record/sign.vue

@@ -1,5 +1,5 @@
 <template>
-  <ui-group-option class="sign record-sign">
+  <ui-group-option class=" record-sign" :class="{sign: record.status === RecordStatus.SUCCESS}">
     <div class="content">
       <span class="cover">
         <img :src="getResource(getFileUrl(record.cover))" alt="" v-if="record.cover">
@@ -25,7 +25,7 @@
         <span v-if="record.status === RecordStatus.RUN">后台正在处理</span>
       </div>
     </div>
-    <div class="action" v-if="edit">
+    <div class="action" v-if="edit && record.status === RecordStatus.SUCCESS">
       <ui-icon type="order" ctrl />
       <ui-more 
         :options="menus" 
@@ -50,19 +50,16 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, computed, watchEffect } from 'vue'
-import { getFileUrl, getExtname } from '@/utils'
-import { useFocus } from 'bill/hook/useFocus'
-import { RecordStatus, createRecordFragment, getRecordFragmentBlobs, recordFragments } from '@/store'
-import { saveAs, loadPack } from '@/utils'
-import { MediaType, Preview } from '@/components/static-preview/index.vue'
-import { getResource } from '@/env'
+import type {PropType} from 'vue'
+import {computed, defineComponent, ref, watchEffect} from 'vue'
+import {getExtname, getFileUrl, loadPack, saveAs} from '@/utils'
+import {useFocus} from 'bill/hook/useFocus'
+import {createRecordFragment, getRecordFragmentBlobs, isTemploraryID, recordFragments, RecordStatus} from '@/store'
+import {MediaType, Preview} from '@/components/static-preview/index.vue'
+import {getResource} from '@/env'
 import Shot from './shot.vue'
-
-import type { PropType } from 'vue'
-import type { RecordProcess } from './help'
-import { isTemploraryID } from '@/store'
-import { Message } from 'bill/index'
+import type {RecordProcess} from './help'
+import {Message} from 'bill/index'
 
 export default defineComponent({
   props: {