Merge branch 'dev-ft' into 'main'

fix:DEFECT-395 修复平台定制联系我们有数据时，在上传图片下方提示 fix:移动插件到对应的视频预览里

See merge request huang/yun-teng-iot-front!215

@@ -13,8 +13,7 @@ import { setupStore } from '/@/store';
 import { setupGlobDirectives } from '/@/directives';
 import { setupGlobDirectives } from '/@/directives';
 import { setupI18n } from '/@/locales/setupI18n';
 import { setupI18n } from '/@/locales/setupI18n';
 import { registerGlobComp } from '/@/components/registerGlobComp';
 import { registerGlobComp } from '/@/components/registerGlobComp';
-import vue3videoPlay from 'vue3-video-play'; // 引入组件
-import 'vue3-video-play/dist/style.css'; // 引入css
+
 if (import.meta.env.DEV) {
 if (import.meta.env.DEV) {
   import('ant-design-vue/dist/antd.less');
   import('ant-design-vue/dist/antd.less');
 }
 }
@@ -47,9 +46,6 @@ async function bootstrap() {
   // Mount when the route is ready
   // Mount when the route is ready
   // https://next.router.vuejs.org/api/#isready
   // https://next.router.vuejs.org/api/#isready
   await router.isReady();
   await router.isReady();
-
-  app.use(vue3videoPlay);
-
   app.mount('#app', true);
   app.mount('#app', true);
 }
 }
 
 

@@ -11,7 +11,7 @@
     >
     >
       <div class="video-sty">
       <div class="video-sty">
         <div>
         <div>
-          <vue3VideoPlay v-bind="options" :poster="videoPoster" />
+          <vue3videoPlay v-bind="options" :poster="videoPoster" />
         </div>
         </div>
       </div>
       </div>
     </BasicModal>
     </BasicModal>
@@ -20,11 +20,14 @@
 <script lang="ts">
 <script lang="ts">
   import { defineComponent, reactive, ref, nextTick } from 'vue';
   import { defineComponent, reactive, ref, nextTick } from 'vue';
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicModal, useModalInner } from '/@/components/Modal';
+  import vue3videoPlay from 'vue3-video-play'; // 引入组件
+  import 'vue3-video-play/dist/style.css'; // 引入css
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'DialogPreviewVideo',
     name: 'DialogPreviewVideo',
     components: {
     components: {
       BasicModal,
       BasicModal,
+      vue3videoPlay,
     },
     },
     emits: ['success', 'register'],
     emits: ['success', 'register'],
     setup() {
     setup() {

@@ -63,7 +63,7 @@
         loading: false,
         loading: false,
         tip: '拼命加载中...',
         tip: '拼命加载中...',
       });
       });
-      const [registerForm, { getFieldsValue, setFieldsValue, validate }] = useForm({
+      const [registerForm, { getFieldsValue, setFieldsValue, validate, clearValidate }] = useForm({
         labelWidth: 80,
         labelWidth: 80,
         schemas,
         schemas,
         showResetButton: false,
         showResetButton: false,
@@ -91,6 +91,7 @@
 
 
       const qrcodePic = ref();
       const qrcodePic = ref();
       const customUploadqrcodePic = async ({ file }) => {
       const customUploadqrcodePic = async ({ file }) => {
+        clearValidate('qrcode');
         if (beforeUploadqrcodePic(file)) {
         if (beforeUploadqrcodePic(file)) {
           const formData = new FormData();
           const formData = new FormData();
           formData.append('file', file);
           formData.append('file', file);