wip

anzusystems · Nov 20, 2023 · d5d922f · d5d922f
1 parent 04869be
commit d5d922f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/src/components/file/AFileInput.vue b/src/components/file/AFileInput.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch, withModifiers } from 'vue'
+import { onMounted, onUnmounted, ref, watch, withModifiers } from 'vue'
 import { isBoolean, isUndefined } from '@/utils/common'
 import AFileDropzone from '@/components/file/AFileDropzone.vue'
 import type { InputFileChangeEvent } from '@/types/ChangeEvent'
@@ -56,15 +56,13 @@ const clickInput = () => {
 const { checkFormatsAndSizes } = useFormatAndSizeCheck(props.accept, props.maxSizes)
 
 const validateData = (files: File[]) => {
-  console.log('validateData')
   if (!props.multiple && files.length > 0) {
-    console.log('emit1')
-    emit('filesInput', checkFormatsAndSizes([files[0]]))
+    const checked = checkFormatsAndSizes([files[0]])
+    emit('filesInput', checked)
     return
   }
-  console.log('emit2')
-  console.log(files)
-  emit('filesInput', checkFormatsAndSizes(files))
+  const checked = checkFormatsAndSizes(files)
+  emit('filesInput', checked)
 }
 
 const onDropzoneDrop = (files: File[]) => {

diff --git a/src/components/image/AImageWidgetInner.vue b/src/components/image/AImageWidgetInner.vue
@@ -101,7 +101,7 @@ const onDrop = (files: File[]) => {
 }
 const onFileInput = (files: File[]) => {
   console.log('onFileInput', files)
-  // uploadQueuesStore.addByFiles(props.queueKey, props.licenceId, files)
+  uploadQueuesStore.addByFiles(props.queueKey, props.licenceId, files)
 }
 
 const { uploadSizes, uploadAccept } = useDamAcceptTypeAndSizeHelper(
@@ -179,7 +179,13 @@ const onAssetSelectConfirm = (data: AssetSelectReturnData) => {
             :accept="uploadAccept"
             :max-sizes="uploadSizes"
             @files-input="onFileInput"
-          />
+          >
+            <template #activator="{ props: fileInputProps }">
+              <VBtn v-bind="fileInputProps">
+                Upload
+              </VBtn>
+            </template>
+          </AFileInput>
         </div>
         <VBtn
           variant="text"
@@ -197,6 +203,7 @@ const onAssetSelectConfirm = (data: AssetSelectReturnData) => {
             v-model="clickMenuOpened"
             activator="parent"
             location="bottom right"
+            eager
           >
             <VCard>
               <VList density="compact">
@@ -206,7 +213,7 @@ const onAssetSelectConfirm = (data: AssetSelectReturnData) => {
                 >
                   <VListItem-title>Update metadata</VListItem-title>
                 </VListItem>
-                <VListItem @click="actionLibrary">
+                <VListItem @click.stop="actionLibrary">
                   <VListItem-title>
                     <span v-if="imageLoaded">Replace from library</span>
                     <span v-else>Choose from library</span>
@@ -219,8 +226,8 @@ const onAssetSelectConfirm = (data: AssetSelectReturnData) => {
                   @files-input="onFileInput"
                 >
                   <template #activator="{ props: fileInputProps }">
-                    <VListItem v-bind="fileInputProps">
-                      Upload
+                    <VListItem @click.stop="fileInputProps.onClick($event)">
+                      Upload kravo
                     </VListItem>
                   </template>
                 </AFileInput>

diff --git a/src/playground/imageView/ImageView.vue b/src/playground/imageView/ImageView.vue
@@ -35,6 +35,7 @@ const imageId2 = ref<IntegerIdNullable>(null)
             :ext-system="1"
             queue-key="ahoj"
             label="Lead image"
+            expand-options
           />
         </VCol>
       </VRow>