Skip to content

Commit 272b1ee

Browse files
committed
fix/model-driven-bugs
1 parent 7d0a1bf commit 272b1ee

5 files changed

Lines changed: 22 additions & 15 deletions

File tree

packages/builtinComponent/src/meta/BasePage.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1659,7 +1659,8 @@
16591659
"itemVisible": true
16601660
}
16611661
]
1662-
}
1662+
},
1663+
"rowOperationEnabled": true
16631664
}
16641665
}
16651666
}

packages/builtinComponent/src/meta/BaseTable.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,8 @@
17851785
"rowOperations": {
17861786
"type": "object",
17871787
"value": []
1788-
}
1788+
},
1789+
"rowOperationEnabled": true
17891790
}
17901791
}
17911792
}

packages/plugins/model-manager/src/Main.vue

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
>
99
<template #header>
1010
<svg-button
11+
v-if="showExportSql"
1112
class="flow-download-icon"
1213
name="flow-download"
1314
placement="bottom"
@@ -56,6 +57,7 @@
5657
<model-setting
5758
:model="selectedModel"
5859
:models="models"
60+
:showExport="showExportSql"
5961
@deleteCallback="handleDeleteModel"
6062
@editCallback="editCallback"
6163
@exportModel="exportModel"
@@ -89,7 +91,7 @@ const selectedModel = ref(null) // 当前选中的模型
8991
// 模型数据列表,包含模型及其字段
9092
const models = ref([])
9193
const localKeyword = ref('')
92-
94+
const showExportSql = ref(false)
9395
const panelState = reactive({
9496
emitEvent: emit
9597
})
@@ -133,8 +135,7 @@ const handleAddModel = () => {
133135
id: null,
134136
nameCn: '',
135137
nameEn: '',
136-
version: '',
137-
modelUrl: '',
138+
modelUrl: `${import.meta.env.VITE_ORIGIN}/platform-center/api/model-data`,
138139
description: '',
139140
parameters: []
140141
}

packages/plugins/model-manager/src/components/ModelBasicForm.vue

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,6 @@
2020
<tiny-input v-model="localValue.nameEn" placeholder="请输入模型英文名称" />
2121
</tiny-form-item>
2222
</div>
23-
<div class="form-item">
24-
<tiny-form-item label="版本号" prop="version">
25-
<tiny-input v-model="localValue.version" placeholder="1.0.0" />
26-
</tiny-form-item>
27-
</div>
2823
<div class="form-item">
2924
<tiny-form-item label="模型地址" prop="modelUrl">
3025
<tiny-input v-model="localValue.modelUrl" placeholder="请输入模型地址,如:https://api.example.com/model" />
@@ -48,7 +43,7 @@ const props = defineProps({
4843
})
4944
5045
// 创建本地副本,直接编辑本地数据
51-
const localValue = ref({ modelUrl: `${import.meta.env.VITE_ORIGIN}/platform-center/api/model-data`, ...props.model })
46+
const localValue = ref(props.model)
5247
5348
const ruleFormRef = ref()
5449
@@ -61,7 +56,6 @@ const rules = ref({
6156
{ required: true, message: '必填', trigger: 'blur' },
6257
{ min: 1, max: 32, message: '长度在1-32之间', trigger: 'blur' }
6358
],
64-
version: [{ required: true, message: '必填', trigger: 'blur' }],
6559
modelUrl: [{ min: 1, max: 200, message: '长度在1-200之间', trigger: 'blur' }]
6660
})
6761

packages/plugins/model-manager/src/components/ModelSetting.vue

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
>
99
<template #header>
1010
<button-group>
11-
<tiny-button @click="$emit('exportModel', selectedModel?.id)">导出SQL</tiny-button>
11+
<tiny-button v-if="showExport" @click="$emit('exportModel', selectedModel?.id)">导出SQL</tiny-button>
1212
<tiny-button type="primary" @click="saveModel">保存</tiny-button>
13-
<svg-button name="delete" v-if="selectedModel?.id" @click="$emit('deleteCallback', selectedModel)"></svg-button>
13+
<svg-button name="delete" v-if="selectedModel?.id" @click="deleteModel"></svg-button>
1414
<svg-button name="close" @click="closeModelSettingPanel"></svg-button>
1515
</button-group>
1616
</template>
@@ -75,6 +75,10 @@ export default {
7575
models: {
7676
type: Array,
7777
default: () => []
78+
},
79+
showExport: {
80+
type: Boolean,
81+
default: false
7882
}
7983
},
8084
emits: ['editCallback', 'exportModel', 'deleteCallback'],
@@ -183,6 +187,11 @@ export default {
183187
}
184188
})
185189
}
190+
191+
const deleteModel = () => {
192+
$emit('deleteCallback', selectedModel)
193+
closeModelSettingPanel()
194+
}
186195
// 监听 props 变化,同步到本地(当选择不同模型时)
187196
watch(
188197
() => props.model,
@@ -202,7 +211,8 @@ export default {
202211
handleAddField,
203212
insertEnumValueAfter,
204213
removeEnumValue,
205-
saveModel
214+
saveModel,
215+
deleteModel
206216
}
207217
}
208218
}

0 commit comments

Comments
 (0)