@sigmaott/base-next 1.4.15 → 1.4.17

package/locales/en.yaml

@@ -717,3 +717,4 @@ watermark:
   valid_file: Valid audio file size must be less than 50 MB.
   warning: Warning
 your_application_currently_has_a_server: Your application currently has a server
+example_path_to_model: 'example: /path/to/model'

package/locales/vi.yaml

@@ -724,3 +724,4 @@ watermark:
   valid_file: Kích thước tệp âm thanh hợp lệ phải nhỏ hơn 50 MB.
   warning: Cảnh báo
 your_application_currently_has_a_server: Ứng dụng của bạn hiện có một máy chủ
+example_path_to_model: 'Ví dụ: /path/to/model'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sigmaott/base-next",
   "type": "module",
-  "version": "1.4.15",
+  "version": "1.4.17",
   "publishConfig": {
     "access": "public"
   },

package/src/components/Channel/ConfigForensicWatermark.vue

@@ -14,6 +14,7 @@ const isPlayout = ref(inject('isPlayout'))
 const { transcodeInput, packageInput } = useGetInputDetail({ formValue, isEvent })
 const input = computed(() => transcodeInput.value || packageInput.value)
 
+const [machineConfigValue] = useElField<boolean>('channelConfig.machineConfig')
 const [encoderIdValue] = useElField<number>('channelConfig.machineConfig.encoderId')
 const [enableValue, enableAttrs] = useElField<boolean>('channelConfig.forensicWatermarkConfig.enable', [])
 const [forensicValue] = useElField<boolean>('channelConfig.forensicWatermarkConfig', [])
@@ -90,13 +91,31 @@ const listConfigWatermark = ref([])
 const loadedPath = ref()
 async function onLoadPath() {
   formRef.value.validate(async (valid: boolean) => {
+    let serverConfig
+
+    if (isPlayout.value || isEvent.value) {
+      serverConfig = {
+        machineId: machineConfigValue.value?.machineId,
+        machineType: machineConfigValue.value?.machineType,
+        mode: machineConfigValue.value?.mode,
+      }
+    }
+    else {
+      serverConfig = {
+        machineId: input.value?.machineConfig?.machineId,
+        machineType: input.value?.machineConfig?.machineType,
+        mode: input.value?.machineConfig?.mode,
+        specMachineId: input.value?.machineConfig?.specMachineId || undefined,
+      }
+    }
+
     if (valid) {
       const rs = await (isEvent.value ? loadPathEventMutation : loadPathPlayoutMutation).mutateAsync({
         machineConfig: {
-          machineId: input.value?.machineConfig.machineId,
-          machineType: input.value?.machineConfig.machineType,
-          mode: input.value?.machineConfig.mode,
-          specMachineId: input.value?.machineConfig.specMachineId || undefined,
+          machineId: serverConfig?.machineId,
+          machineType: serverConfig?.machineType,
+          mode: serverConfig?.mode,
+          specMachineId: input.value?.machineConfig?.specMachineId || undefined,
         },
         path: formPathValue.value.path,
       })
@@ -248,21 +267,12 @@ function handleChangeType(value: string) {
       <template #label>
         <SSInformationLabel :label="$t('EventChannel.form.label.enable')" :info="schemaObj.enable" />
       </template>
-      <el-switch
-        v-model="enableValue"
-        :active-value="true"
-        :inactive-value="false"
-        :disabled="encoderIdValue === -1 && !enableValue"
-      />
+      <el-switch v-model="enableValue" :active-value="true" :inactive-value="false"
+        :disabled="encoderIdValue === -1 && !enableValue" />
     </el-form-item>
     <el-form-item v-bind="modelAttrs" class="w-80px">
       <el-input v-model="modelValue" class="hidden" />
-      <el-button
-        class="w-full"
-        type="primary"
-        :disabled="!enableValue"
-        @click="onShowModel"
-      >
+      <el-button class="w-full" type="primary" :disabled="!enableValue" @click="onShowModel">
         {{ $t('transcode.load') }}
       </el-button>
     </el-form-item>
@@ -307,18 +317,8 @@ function handleChangeType(value: string) {
           <SSInformationLabel label="Type" :info="schemaObj?.type" />
         </template>
         <template #default="{ row }">
-          <el-select
-            v-model="typeValue"
-            placeholder="Select"
-            :disabled="!enableValue"
-            @change="handleChangeType"
-          >
-            <el-option
-              v-for="item in optionsType"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+          <el-select v-model="typeValue" placeholder="Select" :disabled="!enableValue" @change="handleChangeType">
+            <el-option v-for="item in optionsType" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </template>
       </el-table-column>
@@ -328,11 +328,8 @@ function handleChangeType(value: string) {
         </template>
         <template #default="{ row }">
           <el-form-item v-bind="wmAttrs" class="pt-2 [&_.el-form-item\_\_label]:hidden [&_.el-input-number]:!w-full">
-            <el-input
-              v-model.trim="wmValue"
-              :disabled="typeValue !== 'normal' || !enableValue"
-              :placeholder="t('forensic.enter_the_wm_in_hexadecimal_format_e_g_0x64')"
-            />
+            <el-input v-model.trim="wmValue" :disabled="typeValue !== 'normal' || !enableValue"
+              :placeholder="t('forensic.enter_the_wm_in_hexadecimal_format_e_g_0x64')" />
           </el-form-item>
         </template>
       </el-table-column>
@@ -341,15 +338,8 @@ function handleChangeType(value: string) {
           <SSInformationLabel label="alpha" :info="schemaObj?.alpha" />
         </template>
         <template #default="{ row }">
-          <el-input-number
-            v-model="alphaValue"
-            controls-position="right"
-            :min="0.05"
-            :max="0.3"
-            :precision="2"
-            :step="0.01"
-            :disabled="typeValue !== 'normal' || !enableValue"
-          />
+          <el-input-number v-model="alphaValue" controls-position="right" :min="0.05" :max="0.3" :precision="2"
+            :step="0.01" :disabled="typeValue !== 'normal' || !enableValue" />
         </template>
       </el-table-column>
       <el-table-column prop="crc" label="crc">
@@ -358,12 +348,7 @@ function handleChangeType(value: string) {
         </template>
         <template #default="{ row }">
           <el-select v-model="crcValue" placeholder="Select" :disabled="!enableValue">
-            <el-option
-              v-for="item in optionsCrc"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in optionsCrc" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </template>
       </el-table-column>
@@ -373,12 +358,7 @@ function handleChangeType(value: string) {
         </template>
         <template #default="{ row }">
           <el-select v-model="stepValue" placeholder="Select" :disabled="!enableValue">
-            <el-option
-              v-for="item in optionsStep"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in optionsStep" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </template>
       </el-table-column>
@@ -388,34 +368,21 @@ function handleChangeType(value: string) {
         </template>
         <template #default="{ row }">
           <el-select v-model="bchValue" placeholder="Select" :disabled="!enableValue">
-            <el-option
-              v-for="item in optionsBch"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item in optionsBch" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </template>
       </el-table-column>
     </el-table>
   </template>
   <el-dialog v-model="showModel" width="700" destroy-on-close>
-    <el-form
-      ref="formRef"
-      :model="formPathValue"
-      label-width="auto"
-      @submit.prevent
-    >
-      <el-form-item
-        prop="path"
-        :rules="[
-          {
-            required: true,
-            message: $t('transcode.please_input_path_model'),
-            trigger: ['blur', 'change'],
-          },
-        ]"
-      >
+    <el-form ref="formRef" :model="formPathValue" label-width="auto" @submit.prevent>
+      <el-form-item prop="path" :rules="[
+        {
+          required: true,
+          message: $t('transcode.please_input_path_model'),
+          trigger: ['blur', 'change'],
+        },
+      ]">
         <template #label>
           <SSInformationLabel :label="$t('transcode.path_model')" :info="schemaObj.model" />
         </template>
@@ -435,14 +402,8 @@ function handleChangeType(value: string) {
       {{ $t('base_library.loaded_from') }}: <span class="font-bold">{{ loadedPath }}</span>
     </div>
     <el-radio-group v-model="currentRowId" class="w-full">
-      <el-table
-        row-key="id"
-        :current-row-key="currentRowId"
-        :data="listConfigWatermark"
-        border
-        :empty-text
-        @row-click="(row) => currentRowId = row.id"
-      >
+      <el-table row-key="id" :current-row-key="currentRowId" :data="listConfigWatermark" border :empty-text
+        @row-click="(row) => currentRowId = row.id">
         <el-table-column label="#" width="40">
           <template #default="{ row }">
             <el-radio :label="row.id">