|
29 | 29 | </span> |
30 | 30 | </div> |
31 | 31 |
|
32 | | - <div v-for="(setting, index) in settings" id="settings" class="mt-4"> |
| 32 | + <div v-for="setting in settings" :key="setting.id" id="settings" class="mt-4"> |
33 | 33 | <label |
34 | 34 | :for="`setting-${setting.id}`" |
35 | 35 | class="mb-2 block text-left text-sm font-bold" |
|
45 | 45 | /> |
46 | 46 | <template v-else-if="setting.component_type === 'select'"> |
47 | 47 | <Select |
48 | | - v-model="settings.value" |
| 48 | + v-model="setting.value" |
49 | 49 | :options=" |
50 | 50 | setting.default_values.map((val) => ({ |
51 | 51 | label: val.value, |
|
103 | 103 | Setting, |
104 | 104 | updateOneTaskSettings, |
105 | 105 | } from '@/actions/tmgr/settings'; |
106 | | - import { onBeforeMount, ref } from 'vue'; |
| 106 | + import { onBeforeMount, ref, watch } from 'vue'; |
107 | 107 | import { Task } from '@/actions/tmgr/tasks'; |
108 | | - import { CogIcon, XMarkIcon } from '@heroicons/vue/20/solid'; |
| 108 | + import { CogIcon } from '@heroicons/vue/20/solid'; |
109 | 109 | import { |
110 | 110 | Dialog, |
111 | 111 | DialogContent, |
|
115 | 115 | DialogTitle, |
116 | 116 | DialogTrigger, |
117 | 117 | } from '@/components/ui/dialog'; |
118 | | - import { Button } from '@/components/ui/button'; |
119 | 118 | import Select from '@/components/general/Select.vue'; |
120 | 119 |
|
121 | 120 | const emit = defineEmits(['close']); |
122 | 121 |
|
| 122 | + interface SettingWithValue extends Setting { |
| 123 | + value: any; |
| 124 | + } |
| 125 | +
|
123 | 126 | interface Props { |
124 | 127 | form: Task; |
125 | 128 | } |
126 | 129 |
|
127 | 130 | const props = defineProps<Props>(); |
128 | | - const settings = ref<Setting[]>([]); |
| 131 | + const settings = ref<SettingWithValue[]>([]); |
| 132 | + const settingsSchema = ref<Setting[]>([]); |
129 | 133 |
|
130 | 134 | onBeforeMount(async () => { |
131 | | - await loadTaskSettings(); |
| 135 | + settingsSchema.value = await getTaskSettings(); |
| 136 | + mergeSettingsWithFormValues(); |
132 | 137 | }); |
133 | 138 |
|
134 | | - async function loadTaskSettings() { |
135 | | - settings.value = await getTaskSettings(); |
| 139 | + watch( |
| 140 | + () => props.form.settings, |
| 141 | + () => { |
| 142 | + mergeSettingsWithFormValues(); |
| 143 | + }, |
| 144 | + { deep: true } |
| 145 | + ); |
| 146 | +
|
| 147 | + function mergeSettingsWithFormValues() { |
| 148 | + if (!settingsSchema.value.length) return; |
| 149 | + |
| 150 | + settings.value = settingsSchema.value.map((setting: Setting) => { |
| 151 | + const taskSetting = props.form.settings?.find( |
| 152 | + (s: any) => s.id === setting.id || s.key === setting.key |
| 153 | + ) as any; |
| 154 | + |
| 155 | + return { |
| 156 | + ...setting, |
| 157 | + value: taskSetting?.value ?? taskSetting?.pivot?.value ?? '', |
| 158 | + }; |
| 159 | + }); |
136 | 160 | } |
137 | 161 |
|
138 | | - async function saveSettings(settings: FormSetting) { |
| 162 | + async function saveSettings(formSettings: FormSetting) { |
| 163 | + if (!props.form.id) return; |
139 | 164 | try { |
140 | | - await updateOneTaskSettings(props.form.id, settings); |
| 165 | + await updateOneTaskSettings(props.form.id, formSettings); |
141 | 166 | } catch (e) { |
142 | 167 | console.error(e); |
143 | 168 | throw e; |
|
0 commit comments