feat: Group field dialog #4258
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| <template> | ||
| <el-dialog | ||
| :title="isEdit ? $t('common.param.editParam') : $t('common.param.addParam')" | ||
| v-model="dialogVisible" | ||
| :close-on-click-modal="false" | ||
| :close-on-press-escape="false" | ||
| :destroy-on-close="true" | ||
| :before-close="close" | ||
| append-to-body | ||
| > | ||
| <el-form | ||
| label-position="top" | ||
| ref="fieldFormRef" | ||
| :rules="rules" | ||
| :model="form" | ||
| require-asterisk-position="right" | ||
| > | ||
| <el-form-item | ||
| :label="$t('dynamicsForm.paramForm.field.label')" | ||
| :required="true" | ||
| prop="field" | ||
| :rules="rules.field" | ||
| > | ||
| <el-input | ||
| v-model="form.field" | ||
| :maxlength="64" | ||
| :placeholder="$t('dynamicsForm.paramForm.field.placeholder')" | ||
| show-word-limit | ||
| /> | ||
| </el-form-item> | ||
| <el-form-item | ||
| :label="$t('dynamicsForm.paramForm.name.label')" | ||
| :required="true" | ||
| prop="label" | ||
| :rules="rules.label" | ||
| > | ||
| <el-input | ||
| v-model="form.label" | ||
| :maxlength="64" | ||
| show-word-limit | ||
| :placeholder="$t('dynamicsForm.paramForm.name.placeholder')" | ||
| /> | ||
| </el-form-item> | ||
| </el-form> | ||
| <template #footer> | ||
| <span class="dialog-footer"> | ||
| <el-button @click.prevent="close"> {{ $t('common.cancel') }} </el-button> | ||
| <el-button type="primary" @click="submit(fieldFormRef)" :loading="loading"> | ||
| {{ isEdit ? $t('common.save') : $t('common.add') }} | ||
| </el-button> | ||
| </span> | ||
| </template> | ||
| </el-dialog> | ||
| </template> | ||
| <script setup lang="ts"> | ||
| import { reactive, ref } from 'vue' | ||
| import type { FormInstance } from 'element-plus' | ||
| import { cloneDeep } from 'lodash' | ||
| import { t } from '@/locales' | ||
| const emit = defineEmits(['refresh']) | ||
| const fieldFormRef = ref() | ||
| const loading = ref<boolean>(false) | ||
| const isEdit = ref(false) | ||
| const currentIndex = ref(null) | ||
| const form = ref<any>({ | ||
| field: '', | ||
| label: '', | ||
| }) | ||
| const rules = reactive({ | ||
| label: [ | ||
| { required: true, message: t('dynamicsForm.paramForm.name.requiredMessage'), trigger: 'blur' }, | ||
| ], | ||
| field: [ | ||
| { required: true, message: t('dynamicsForm.paramForm.field.requiredMessage'), trigger: 'blur' }, | ||
| { | ||
| pattern: /^[a-zA-Z0-9_]+$/, | ||
| message: t('dynamicsForm.paramForm.field.requiredMessage2'), | ||
| trigger: 'blur', | ||
| }, | ||
| ], | ||
| }) | ||
| const dialogVisible = ref<boolean>(false) | ||
| const open = (data: any, index?: any) => { | ||
| if (data) { | ||
| form.value = cloneDeep(data) | ||
| isEdit.value = true | ||
| currentIndex.value = index | ||
| } | ||
| dialogVisible.value = true | ||
| } | ||
| const close = () => { | ||
| dialogVisible.value = false | ||
| isEdit.value = false | ||
| currentIndex.value = null | ||
| form.value = { | ||
| field: '', | ||
| label: '', | ||
| } | ||
| } | ||
| const submit = async (formEl: FormInstance | undefined) => { | ||
| if (!formEl) return | ||
| await formEl.validate((valid) => { | ||
| if (valid) { | ||
| emit('refresh', form.value, currentIndex.value) | ||
| } | ||
| }) | ||
| } | ||
| defineExpose({ open, close }) | ||
| </script> | ||
| <style lang="scss" scoped></style> | ||
|
Contributor
Author
There was a problem hiding this comment. Your code looks well-organized and follows best practices. A couple of minor suggestions to improve it:
Here's the improved version: @@ -0,0 +1,118 @@
+++<template>
+++ <el-dialog
+++ :title="isEdit ? $t('common.param.editParam') : $t('common.param.addParam')"
+++ v-model="dialogVisible"
+++ :close-on-click-modal="false"
+++ :close-on-press-escape="false"
+++ :destroy-on-close="true"
+++ :before-close="close"
+++ append-to-body
+++ @open="(val) => open(val)"
+++ >
++++ <el-form
+++ label-position="top"
+++ ref="fieldFormRef"
+++ :rules="rules"
+++ :model="form"
+++ require-asterisk-position="right"
+++ >
++++ <el-form-item
++++ :label="$t('dynamicsForm.paramForm.field.label')"
++++ :required="true"
++++ prop="field"
++++ :rules="rules.field"
++++ >
++++ <el-input
++++ v-model="form.field"
++++ :maxlength="64"
++++ show-word-limit
++++ :placeholder="$t('dynamicsForm.paramForm.field.placeholder')"
++++ />
++++ </el-form-item>
++++ <el-form-item
++++ :label="$t('dynamicsForm.paramForm.name.label')"
++++ :required="true"
++++ prop="label"
++++ :rules="rules.label"
++++ >
++++ <el-input
++++ v-model="form.label"
++++ :maxlength="64"
++++ show-word-limit
++++ :placeholder="$t('dynamicsForm.paramForm.name.placeholder')"
++++ />
++++ </el-form-item>
++++ </el-form>
++++ <template #footer>
++++ <span class="dialog-footer">
++++ <el-button @click="handleCancel"> {{ $t('common.cancel') }} </el-button>
++++ <el-button type="primary" @click="handleSubmit(form)" :loading="loading">
++++ {{ isEdit ? $t('common.save') : $t('common.add') }}
++++ </el-button>
++++ </span>
++++ </template>
++++</el-dialog>
+++</template>
+++<script setup lang="ts">
+import { reactive, ref } from 'vue'
+import type { FormInstance } from 'element-plus'
+import { cloneDeep } from 'lodash'
+import { t } from '@/locales'
+defineProps<{
+ data?: any; // Assuming you have a data prop for passing initial values when editing an item
+}>();
+
+const emit = defineEmits(['refresh']);
+
+const fieldFormRef = ref<FormInstance>()
+const loading = ref<boolean>(false)
+const isEdit = ref<boolean>(false)
+const currentIndex = ref<number> || null;
+const originData = ref({});
+const form = ref<{ field: string, label: string }>({
+ field: '',
+ label: ''
+ });
+originData.value = {...form};
+
+const rules = reactive({
+ label: [
+ { required: true, message: t('dynamicsForm.paramForm.name.requiredMessage'), trigger: 'blur' },
+ ],
+ field: [
+ { required: true, message: t('dynamicsForm.paramForm.field.requiredMessage'), trigger: 'blur' },
+ {
+ pattern: /^[a-zA-Z0-9_]+$/,
+ message: t('dynamicsForm.paramForm.field.requiredMessage2'),
+ trigger: 'blur',
+ },
+ ],
+});
+
+const dialogVisible = ref<boolean >(false);
+// Simplified logic to determine if we're adding new parameter or updating existing one
+if(data){
+ Object.assign(originData, data); // Copy current props value into original data so that update works
+ form.value = cloneDeep(originData);// Resetting form state based on copied value
+ isEdit.value = true;
+}
+else{
+ form.value.field = '';
+ form.value.label = '';
+}
+
+function open() {
+ console.log("Opened") // For debugging purposes
+}
+
+function handleCancel(): void {
+ // reseting all fields but maintaining references to objects/arrays inside the object
+ const fields= ['field', 'label'];
+ fields.forEach((field)=>{
+ if(!Array.isArray(this[field]) && typeof this[field] === 'object'){
+ this[fields]=Object.assign({}, originData.value)[fields];
+ }
+ else
+ this[field] = '' ;
+");
+ }
+
+ dialogVisible.value = false;
+ isEdit.value = false;
+ currentIndex.value = null;
+}
+
+function handleSubmit(formEl: FormInstance): Promise<void> {
+ if (!formEl) return;
+ await formEl.validate((valid) => {
+ if (valid) {
+ let sendData=form.value; // Create a copy of form before resetting to use later in case of success handling needed
+ submitFn(sendData);
+ }
+ })
|}
+function submitFn(payload:any){emit('submit',payload , currentIndex.value)}
+
+Changes Made:
These changes should improve readability and maintainability while still preserving key functionality. |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The code provided has a small issue regarding the use of
fieldinstead ofgroup_name. The field name should be consistent with its description to avoid confusion and errors.Here's my corrected suggestion:
Key Changes:
fieldwithgroup_name, which aligns better with the intended meaning "Group Name".This slight change maintains consistency and prevents potential confusion. Let me know if you have any other questions!