diff --git a/src/components/common/FTDialog/index.vue b/src/components/common/FTDialog/index.vue index d54f8cb..af16b8e 100644 --- a/src/components/common/FTDialog/index.vue +++ b/src/components/common/FTDialog/index.vue @@ -14,9 +14,9 @@ const props = defineProps({ type: String, default: '50%', }, - okLoading: { + okHandle: { type: Boolean, - default: false, + default: () => {}, }, }) const emits = defineEmits(['update:visible', 'ok', 'cancel']) @@ -25,9 +25,6 @@ const cancel = () => { show.value = false emits('cancel') } -const ok = () => { - emits('ok') -} const show = ref(false) @@ -66,7 +63,7 @@ watch( 取消 - + 确认 diff --git a/src/components/common/FTTable/index.vue b/src/components/common/FTTable/index.vue index e01852d..60a2ebb 100644 --- a/src/components/common/FTTable/index.vue +++ b/src/components/common/FTTable/index.vue @@ -10,6 +10,7 @@ const props = withDefaults(defineProps(), { columns: () => [], mustInit: true, hasHeader: true, + getDataFn: () => Promise.resolve([]), }) const emits = defineEmits([]) enum ColumnType { @@ -79,49 +80,47 @@ defineExpose({ diff --git a/src/components/home/SelectCraft/index.vue b/src/components/home/SelectCraft/index.vue index 14f9b0f..e20ba17 100644 --- a/src/components/home/SelectCraft/index.vue +++ b/src/components/home/SelectCraft/index.vue @@ -51,8 +51,8 @@ const getOres = async () => {