@sigmaott/base-next 1.4.24 → 1.4.26

package/package.json

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

package/src/components/Channel/ConfigForensicWatermark.vue

@@ -26,13 +26,16 @@ const [modelValue, modelAttrs] = useElField<number>('channelConfig.forensicWater
     trigger: ['blur', 'change'],
   },
 ], { enabled: enableValue })
+const isRequiredWm = computed(() => {
+  return typeValue.value === 'normal' && enableValue.value
+})
 
 const [typeValue, typeAttrs] = useElField<string>('channelConfig.forensicWatermarkConfig.type', {
   message: t('forensic.type_is_required'),
   required: false,
 }, { enabled: enableValue })
 const [wmValue, wmAttrs] = useElField<string>('channelConfig.forensicWatermarkConfig.wm', [{
-  message: t('forensic.enter_the_wm_in_format_e_g_0x64'),
+  message: t('forensic.wm_is_required'),
   required: true,
 }, {
   validator: (rule, value, callback) => {
@@ -49,7 +52,7 @@ const [wmValue, wmAttrs] = useElField<string>('channelConfig.forensicWatermarkCo
       callback()
   },
   trigger: ['blur', 'change'],
-}], { enabled: enableValue })
+}], { enabled: isRequiredWm })
 const [wmBValue] = useElField<string>('channelConfig.forensicWatermarkConfig.wmB', [])
 const [crcValue, crcAttrs] = useElField<number>('channelConfig.forensicWatermarkConfig.crc', {
   required: false,
@@ -200,7 +203,10 @@ async function handleSelectConfig(id: string) {
     //   message: $t('base_library.feature_mismatch_the_path_cannot_be_used_with_feature-name', ['<strong>Ads detect</strong>']),
     // })
   }
-  formForensicRef.value?.validateField('channelConfig.forensicWatermarkConfig.wm')
+
+  nextTick(() => {
+    formForensicRef.value?.validateField('channelConfig.forensicWatermarkConfig.wm')
+  })
 }
 const currentRowId = ref()
 
@@ -334,7 +340,7 @@ function handleChangeType(value: string) {
         <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')" />
+            :placeholder="t('forensic.enter_the_wm_in_format_e_g_0x64')" />
           </el-form-item>
         </template>
       </el-table-column>