diff --git a/src/views/run/instant/CreateModal.vue b/src/views/run/instant/CreateModal.vue index 440504a..2ca5228 100644 --- a/src/views/run/instant/CreateModal.vue +++ b/src/views/run/instant/CreateModal.vue @@ -23,15 +23,15 @@ const state = reactive({ pointInfo: [], type: false, }) -// 本地isDisabled变量 +// 本地isDisabled变量-表征下一步按钮的启用与禁用 const isDisabled = ref(true) const [registerCreateModal, {setModalProps, closeModal}] = useModalInner(async (data) => { - resetFields() + alert(444) + await resetFields() current.value=0; state.selectedData=[]; state.selectedRowKeys=[]; - isDisabled.value = true }) @@ -42,18 +42,6 @@ function next() { function prev() { current.value-- } - -// const steps = [ -// { -// title: '壹', -// content: 'First-content', -// }, -// { -// title: '贰', -// content: 'Second-content', -// }, -// ] -// const items = steps.map(item => ({key: item.title, title: item.title})) const steps = [ { key: '壹', title: '壹' }, { key: '贰', title: '贰' }, @@ -64,7 +52,6 @@ const [registerForm, {validate, resetFields,getFieldsValue, setFieldsValue, upda showSubmitButton: false, showResetButton: false, layout: 'horizontal', - disabled: true, actionColOptions: { span: 0, // 不占任何列 style: { display: 'none' }, @@ -142,7 +129,8 @@ async function updatempName(selectedRowKeys, selectedRows) { } function onCanel() { - current.value = 0 + state.selectedData=[]; + state.selectedRowKeys=[]; closeModal() } diff --git a/src/views/run/model/ModelTable.vue b/src/views/run/model/ModelTable.vue index 856937a..75e021e 100644 --- a/src/views/run/model/ModelTable.vue +++ b/src/views/run/model/ModelTable.vue @@ -23,25 +23,25 @@ const props = defineProps({ }, }) -const selectedData = ref(props.selectedData) +const selectedData = ref() interface RowKeys { selectedRowKeys: number[] } const state = reactive({ - selectedRowKeys: props.selectedRowKeys + selectedRowKeys: [] }) const { t } = useI18n() -watch( - () => props.selectedRowKeys, - () => { - setSelectedRowKeys(props.selectedRowKeys) - setSelectedRows(props.selectedData) - state.selectedRowKeys = props.selectedRowKeys -console.log(state.selectedRowKeys) - selectedData.value=props.selectedData - }, -) +// watch( +// () => props.selectedRowKeys, +// () => { +// setSelectedRowKeys(props.selectedRowKeys) +// setSelectedRows(props.selectedData) +// state.selectedRowKeys = props.selectedRowKeys +// console.log(state.selectedRowKeys) +// selectedData.value=props.selectedData +// }, +// ) const [registerTable, { getSelectRows,setSelectedRowKeys,setSelectedRows }] = useTable({ title: '模型列表(已下装)', @@ -74,11 +74,13 @@ const [registerTable, { getSelectRows,setSelectedRowKeys,setSelectedRows }] = us showIndexColumn: false, }) -onMounted(async () => { - setSelectedRowKeys(props.selectedRowKeys) - setSelectedRows(props.selectedData) -}) + onMounted(() => { + setSelectedRowKeys([...props.selectedRowKeys]) + setSelectedRows([...props.selectedData]) + }) + + // watch( // () => props.selectedRowKeys,