Merge remote-tracking branch 'origin/main'

src/assets/style/default.css

@@ -314,6 +314,7 @@ table.table-colored tbody tr:hover {
 
 .table-cell-image {
   max-height: 100px;
+  border: 1px solid #ececec;
 }
 
 .table-cell-flx-row {

src/components/global/FormCheckbox.vue

@@ -6,7 +6,9 @@
           {{ title }}
           <i v-if="required" class="form-item-alert">*</i>
         </span>
-        <label :class="['label-radio', disabled ? 'disabled' : '']" v-for="(item, i) in listData">
+        <label
+          :class="['label-radio', disabled ? 'disabled' : '']"
+          v-for="(item, i) in listData">
           <input
             type="checkbox"
             v-model="localValue"
@@ -72,7 +74,7 @@
     val?: number | string | boolean
     label?: string
     disabled?: boolean
-    modelValue: (string | number)[] | boolean | string | number | null
+    modelValue: (string | number)[] | boolean | string | number | null | undefined
     half?: boolean
     title?: string
     invalidText?: string
@@ -89,7 +91,7 @@
 
   const emit = defineEmits(['update:modelValue', 'change', 'click'])
 
-  const localValue = ref<(string | number)[] | boolean | null | string | number>(
+  const localValue = ref<(string | number)[] | boolean | null | string | number|undefined>(
     props.modelValue
   )
 

src/module/site-yonetimi/views/PopupListe.vue

@@ -12,7 +12,7 @@
         :tableData='popups'
         apiText='Popup Listesi'
         apiList='Popup'
-        v-model:refresh='refresh'
+        v-model:refresh="refresh"
       />
     </section>
     <panel-wrapper
@@ -46,7 +46,7 @@
         v-model="panelPopup.durum" >
         <template #checktext0>
               <span>
-                Durum
+                Aktif
               </span>
         </template>
       </form-checkbox>
@@ -66,6 +66,9 @@
   import router from '@/router'
   import { useDataStore } from '@/stores/dataStore'
   import PanelWrapper from '@/components/PanelWrapper.vue'
+    import { useGlobalStore } from '@/stores/globalStore'
+  const globalStore = useGlobalStore()
+
   const  Checker = ref([
     {
       label: '',
@@ -88,7 +91,12 @@
     },
     {
       name: 'resimUrl',
-      title: 'Resim Url'
+      title: 'Resim Url',
+      computeHtml: (v: Record<string, any>) => {
+        if (v.resimUrl !== null && v.resimUrl !== undefined) {
+          return globalStore.TableCellDocument(v.resimUrl)
+        }
+      }
     },
     {
       name: 'url',
@@ -96,7 +104,16 @@
     },
     {
       name: 'durum',
-      title: 'Durum'
+      title: 'Durum',
+      computeHtml: (v: Record<string, any>): string => {
+          if (v.durum) {
+            return `<span class="back-grad back-grad-ok">
+                Aktif
+              </strong>`
+          } else {
+            return ``
+          }
+        }
     }
   ])
   const resimPreview = computed(() => {
@@ -130,12 +147,6 @@
     panel.value = true
     isUpdate.value = true
   }
-  const load = async () => {
-    const data = await dataStore.dataGet('Popup')
-    console.log('apidata', data)
-    popups.value = data
-    console.log(popups.value)
-  }
 
   const save = async () => {
     if (isUpdate.value)
@@ -170,10 +181,6 @@
     }
 
   }
-
-  onMounted(() => {
-    load()
-  })
 </script>
 <style>
   .image-preview-wrapper {