Compare commits

..

No commits in common. "41adb7ecb0f95353c80745f050781b50a68b3a31" and "d9586511c3f0f5f107e2c47a2c7789f1f2abb37c" have entirely different histories.

4 changed files with 10 additions and 13 deletions

View File

@ -1,6 +1,6 @@
<template> <template>
<box size="none" class="opacity-[0.8] hover:opacity-[1.0]" :type="type"> <box size="none" class="opacity-[0.8] hover:opacity-[1.0]" :type="type">
<div href="#" @click.prevent="emit('update:model-value', modelValue === index ? -1 : index)" class="flex items-center justify-between p-2 cursor-pointer"> <div href="#" @click.prevent="emit('update:model-value', modelValue === index ? -1 : index)" class="flex items-center justify-between p-2">
<div v-text="title"></div> <div v-text="title"></div>
<div class="flex items-center space-x-2"> <div class="flex items-center space-x-2">
<slot name="buttons"></slot> <slot name="buttons"></slot>

View File

@ -1,5 +1,5 @@
<template> <template>
<v-checkbox :id="innerId" v-model="inner" :label="field.name" :description="field.description" :name="field.key" :required="field.required" :intro="field.intro" :hint="field.hint"></v-checkbox> <v-checkbox :id="innerId" v-model="inner" :name="field.key" :label="field.description" :required="field.required" :intro="field.intro" :hint="field.hint"></v-checkbox>
</template> </template>
<script setup> <script setup>

View File

@ -57,7 +57,7 @@
@update:modelValue="toggleMember(member)" @update:modelValue="toggleMember(member)"
:name="`${field.key}-memberselect-${member.id}`" :name="`${field.key}-memberselect-${member.id}`"
:id="`${field.key}-memberselect-${member.id}`" :id="`${field.key}-memberselect-${member.id}`"
:description="member.name" :label="member.name"
intro="" intro=""
v-for="member in searchResults.data" v-for="member in searchResults.data"
></v-checkbox> ></v-checkbox>
@ -102,7 +102,7 @@
v-model="member[memberField.key]" v-model="member[memberField.key]"
:name="`${field.key}-memberattr-${member.id}-${memberField.key}`" :name="`${field.key}-memberattr-${member.id}-${memberField.key}`"
:id="`${field.key}-memberattr-${member.id}-${memberField.key}`" :id="`${field.key}-memberattr-${member.id}-${memberField.key}`"
:description="memberField.description" :label="memberField.description"
intro="" intro=""
:required="memberField.required" :required="memberField.required"
:class="colClassesForField(memberField)" :class="colClassesForField(memberField)"

View File

@ -1,7 +1,6 @@
<template> <template>
<div class="relative"> <div class="relative">
<field-label v-if="label" :name="label" :required="required" :hint="hint" inline></field-label> <div class="grid grid-cols-1 gap-2">
<div class="grid grid-cols-1 gap-2 pt-1">
<div class="text-sm text-gray-600" v-text="intro" v-if="intro"></div> <div class="text-sm text-gray-600" v-text="intro" v-if="intro"></div>
<label :for="id" class="p-0 block leading-none relative flex items-start"> <label :for="id" class="p-0 block leading-none relative flex items-start">
<input :id="id" v-model="inner" type="checkbox" :name="name" class="peer absolute invisible" /> <input :id="id" v-model="inner" type="checkbox" :name="name" class="peer absolute invisible" />
@ -9,9 +8,11 @@
class="border-neutral-400 border-4 group-[.box]:border-2 border-solid peer-checked:border-primary absolute left-0 w-6 h-6 group-[.box]:w-4 group-[.box]:h-4 group-[.box]:top-[5px] rounded block top-0" class="border-neutral-400 border-4 group-[.box]:border-2 border-solid peer-checked:border-primary absolute left-0 w-6 h-6 group-[.box]:w-4 group-[.box]:h-4 group-[.box]:top-[5px] rounded block top-0"
></span> ></span>
<span class="peer-checked:bg-primary left-[0.5rem] top-[0.5rem] group-[.box]:top-[0.58rem] group-[.box]:left-[0.25rem] w-2 h-2 absolute rounded block top-0"></span> <span class="peer-checked:bg-primary left-[0.5rem] top-[0.5rem] group-[.box]:top-[0.58rem] group-[.box]:left-[0.25rem] w-2 h-2 absolute rounded block top-0"></span>
<span v-if="description" class="pl-8 group-[.box]:pl-6 pt-1 @sm:pt-0 @sm:group-[.box]:pt-1 text-gray-600 text-sm @sm:text-base @sm:group-[.box]:text-sm"> <span v-if="label" class="pl-8 group-[.box]:pl-6 pt-1 @sm:pt-0 @sm:group-[.box]:pt-1 text-gray-600 text-sm @sm:text-base @sm:group-[.box]:text-sm">
<span v-text="description"></span> <span v-text="label"></span>
<span v-show="required" class="text-red-800"> *</span>
</span> </span>
<hint :value="hint" class="ml-2" v-if="hint"></hint>
</label> </label>
</div> </div>
</div> </div>
@ -19,7 +20,7 @@
<script setup> <script setup>
import {computed} from 'vue'; import {computed} from 'vue';
import FieldLabel from '../FieldLabel.vue'; import Hint from '../Hint.vue';
const emit = defineEmits(['update:modelValue']); const emit = defineEmits(['update:modelValue']);
const props = defineProps({ const props = defineProps({
@ -40,10 +41,6 @@ const props = defineProps({
type: String, type: String,
default: () => '', default: () => '',
}, },
description: {
required: false,
type: String,
},
required: { required: {
required: false, required: false,
type: Boolean, type: Boolean,