diff --git a/smart-admin-web-javascript/src/components/support/dict-code-select/index.vue b/smart-admin-web-javascript/src/components/support/dict-code-select/index.vue
index e8d1c893..73945036 100644
--- a/smart-admin-web-javascript/src/components/support/dict-code-select/index.vue
+++ b/smart-admin-web-javascript/src/components/support/dict-code-select/index.vue
@@ -54,17 +54,27 @@
type: Number,
default: null,
},
+ dictList: {
+ type: Array,
+ default: null,
+ },
});
// -------------------------- 查询 字典数据 --------------------------
- const dictList = ref([]);
+ const dictList = ref(props.dictList || []);
async function queryDict() {
+ if (props.dictList) {
+ dictList.value = props.dictList;
+ return;
+ }
let response = await dictApi.getAllDict();
dictList.value = response.data;
}
- onMounted(queryDict);
+ if (!props.dictList) {
+ queryDict();
+ }
// -------------------------- 选中 相关、事件 --------------------------
const emit = defineEmits(['update:value', 'change']);
diff --git a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
index 8ac2e387..e5cd304b 100644
--- a/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
+++ b/smart-admin-web-javascript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
@@ -68,7 +68,7 @@
-
+
@@ -84,8 +84,16 @@
import DictCodeSelect from '/@/components/support/dict-code-select/index.vue';
import { convertUpperCamel, convertLowerCamel } from '/@/utils/str-util';
import _ from 'lodash';
+ import { dictApi } from '/@/api/support/dict-api';
const dictRef = ref();
+ const dictList = ref([]);
+ async function loadDictList() {
+ const response = await dictApi.getAllDict();
+ dictList.value = response.data;
+ }
+ loadDictList();
+
function refreshDict() {
dictRef.value.queryDict();
}
@@ -231,4 +239,4 @@
});
-
+
\ No newline at end of file
diff --git a/smart-admin-web-typescript/src/components/support/dict-code-select/index.vue b/smart-admin-web-typescript/src/components/support/dict-code-select/index.vue
index 94ee9ec4..274bf9a1 100644
--- a/smart-admin-web-typescript/src/components/support/dict-code-select/index.vue
+++ b/smart-admin-web-typescript/src/components/support/dict-code-select/index.vue
@@ -54,17 +54,27 @@
type: Number,
default: null,
},
+ dictList: {
+ type: Array,
+ default: null,
+ },
});
// -------------------------- 查询 字典数据 --------------------------
- const dictList = ref([]);
+ const dictList = ref(props.dictList || []);
async function queryDict() {
+ if (props.dictList) {
+ dictList.value = props.dictList;
+ return;
+ }
let response = await dictApi.getAllDict();
dictList.value = response.data;
}
- onMounted(queryDict);
+ if (!props.dictList) {
+ queryDict();
+ }
// -------------------------- 选中 相关、事件 --------------------------
const emit = defineEmits(['update:value', 'change']);
@@ -80,4 +90,4 @@
emit('update:value', value);
emit('change', value);
}
-
+
\ No newline at end of file
diff --git a/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
index 3e8e2ae0..20df4c60 100644
--- a/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
+++ b/smart-admin-web-typescript/src/views/support/code-generator/components/form/code-generator-table-config-form-field.vue
@@ -68,7 +68,7 @@
-
+
@@ -83,9 +83,17 @@
import { checkExistEnum, convertJavaEnumName, getJavaType, getJsType, JavaTypeList, JsTypeList } from '../../code-generator-util';
import DictCodeSelect from '/@/components/support/dict-code-select/index.vue';
import { convertUpperCamel, convertLowerCamel } from '/@/utils/str-util';
+ import { dictApi } from '/@/api/support/dict-api';
import _ from 'lodash';
const dictRef = ref();
+ const dictList = ref([]);
+ async function loadDictList() {
+ const response = await dictApi.getAllDict();
+ dictList.value = response.data;
+ }
+ loadDictList();
+
function refreshDict() {
dictRef.value.queryDict();
}
@@ -231,4 +239,4 @@
});
-
+
\ No newline at end of file