Skip to content

Commit 07458fb

Browse files
cloydlaucloydlau
committed
release: v1.0.0-beta.0
1 parent 6e492c2 commit 07458fb

File tree

10 files changed

+185
-277
lines changed

10 files changed

+185
-277
lines changed

‎demo/utils/useAdmateAdapter.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default (
5656
// 可访问 this（组件实例）
5757
// this 判空原因：只有表单没有列表时，openForm 会在 setup 时执行
5858
getElFormRefOfFormData = function () {
59-
return this?.$refs.formRef
59+
return this?.$refs.faFormDialogRef.$refs.elFormRef
6060
},
6161

6262
// 校验详情表单
@@ -104,7 +104,7 @@ export default (
104104
// 列表筛选项的 ref
105105
const listFilterRef = ref()
106106
// 详情的 ref
107-
const formRef = ref()
107+
const faFormDialogRef = ref()
108108

109109
// 初始化 admate
110110
const { list, form } = useAdmate(
@@ -376,7 +376,7 @@ export default (
376376
// 表单
377377
form,
378378
// 详情的 ref
379-
formRef,
379+
faFormDialogRef,
380380
// 表单标题
381381
formTitle: computed(() => formTitleMap[form.status]),
382382
// 表单标题字典

‎demo/vue2.6/Page.vue‎

Lines changed: 25 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,73 +6,53 @@ const {
66
list,
77
listFilterRef,
88
queryList,
9+
resetList,
910
form,
10-
formRef,
11+
faFormDialogRef,
1112
formTitle,
1213
} = useAdmateAdapter({
1314
axiosConfig: {
1415
urlPrefix,
1516
},
16-
list: {
17-
filter: {
18-
name: '123',
19-
},
20-
},
21-
}, {
22-
getElFormRefOfFormData() {
23-
return formRef.value
24-
},
2517
})
2618
</script>
2719

2820
<template>
29-
<div class="p-20px">
21+
<div p-20px>
3022
<el-form
3123
ref="listFilterRef"
3224
:model="list.filter"
3325
inline
3426
>
35-
<el-form-item
36-
prop="name"
37-
required
38-
>
27+
<el-form-item prop="name">
3928
<el-input
4029
v-model="list.filter.name"
4130
placeholder="姓名"
4231
/>
4332
</el-form-item>
4433
<el-form-item prop="status">
45-
<el-select
34+
<FaSelect
4635
v-model="list.filter.status"
36+
w="180px!"
4737
placeholder="状态"
48-
>
49-
<el-option
50-
v-for="(v, i) of ['停用', '启用']"
51-
:key="i"
52-
:label="v"
53-
:value="v"
54-
/>
55-
</el-select>
38+
:options="['停用', '启用']"
39+
/>
5640
</el-form-item>
5741
<el-form-item>
5842
<el-button
5943
v-if="!list.watchFilter"
6044
type="primary"
61-
@click="queryList"
45+
@click="queryList()"
6246
>
6347
查询
6448
</el-button>
65-
<el-button
66-
@click="() => {
67-
listFilterRef.resetFields()
68-
}"
69-
>
49+
<el-button @click="resetList()">
7050
重置
7151
</el-button>
7252
</el-form-item>
7353
</el-form>
7454

75-
<div class="flex justify-between my-10px">
55+
<div flex justify-between my-10px>
7656
<div>
7757
<el-button
7858
type="primary"
@@ -123,35 +103,22 @@ const {
123103
</el-table-column>
124104
</el-table>
125105

126-
<el-dialog
106+
<FaFormDialog
107+
ref="faFormDialogRef"
108+
v-model="form.data"
109+
:readonly="form.status === 'read'"
110+
:show.sync="form.show"
127111
:title="formTitle"
128-
:visible.sync="form.show"
112+
:retrieving="form.loading"
113+
:confirm="form.submit"
129114
>
130-
<el-form
131-
ref="formRef"
132-
v-loading="form.loading"
133-
:model="form.data"
134-
:disabled="form.status === 'read' || form.submitting"
115+
<el-form-item
116+
label="姓名"
117+
prop="name"
118+
required
135119
>
136-
<el-form-item
137-
label="姓名"
138-
prop="name"
139-
required
140-
>
141-
<el-input v-model="form.data.name" />
142-
</el-form-item>
143-
</el-form>
144-
<template #footer>
145-
<el-button @click="form.show = false">取 消</el-button>
146-
<el-button
147-
v-if="form.status !== 'read' && !form.loading"
148-
type="primary"
149-
:loading="form.submitting"
150-
@click="form.submit()"
151-
>
152-
确 定
153-
</el-button>
154-
</template>
155-
</el-dialog>
120+
<el-input v-model="form.data.name" />
121+
</el-form-item>
122+
</FaFormDialog>
156123
</div>
157124
</template>

‎demo/vue2.6/index.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ import 'uno.css'
44

55
import 'element-ui/lib/theme-chalk/index.css'
66
import ElementUI from 'element-ui'
7-
87
import { FaFormDialog, FaSelect } from 'faim'
8+
import FaimLocale from 'faim/dist/locale/zh-cn.mjs'
99

1010
import App from './index.vue'
1111
import router from './router'
1212

1313
Vue.use(ElementUI)
14-
Vue.use(FaFormDialog)
15-
Vue.use(FaSelect)
14+
Vue.use(FaFormDialog, { locale: FaimLocale.FaFormDialog })
15+
Vue.use(FaSelect, { locale: FaimLocale.FaSelect })
1616

1717
new Vue({
1818
render: h => h(App),

‎demo/vue2.7/Page.vue‎

Lines changed: 25 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -6,73 +6,53 @@ const {
66
list,
77
listFilterRef,
88
queryList,
9+
resetList,
910
form,
10-
formRef,
11+
faFormDialogRef,
1112
formTitle,
1213
} = useAdmateAdapter({
1314
axiosConfig: {
1415
urlPrefix,
1516
},
16-
list: {
17-
filter: {
18-
name: '123',
19-
},
20-
},
21-
}, {
22-
getElFormRefOfFormData() {
23-
return formRef.value
24-
},
2517
})
2618
</script>
2719

2820
<template>
29-
<div class="p-20px">
21+
<div p-20px>
3022
<el-form
3123
ref="listFilterRef"
3224
:model="list.filter"
3325
inline
3426
>
35-
<el-form-item
36-
prop="name"
37-
required
38-
>
27+
<el-form-item prop="name">
3928
<el-input
4029
v-model="list.filter.name"
4130
placeholder="姓名"
4231
/>
4332
</el-form-item>
4433
<el-form-item prop="status">
45-
<el-select
34+
<FaSelect
4635
v-model="list.filter.status"
36+
w="180px!"
4737
placeholder="状态"
48-
>
49-
<el-option
50-
v-for="(v, i) of ['停用', '启用']"
51-
:key="i"
52-
:label="v"
53-
:value="v"
54-
/>
55-
</el-select>
38+
:options="['停用', '启用']"
39+
/>
5640
</el-form-item>
5741
<el-form-item>
5842
<el-button
5943
v-if="!list.watchFilter"
6044
type="primary"
61-
@click="queryList"
45+
@click="queryList()"
6246
>
6347
查询
6448
</el-button>
65-
<el-button
66-
@click="() => {
67-
listFilterRef.resetFields()
68-
}"
69-
>
49+
<el-button @click="resetList()">
7050
重置
7151
</el-button>
7252
</el-form-item>
7353
</el-form>
7454

75-
<div class="flex justify-between my-10px">
55+
<div flex justify-between my-10px>
7656
<div>
7757
<el-button
7858
type="primary"
@@ -123,35 +103,22 @@ const {
123103
</el-table-column>
124104
</el-table>
125105

126-
<el-dialog
106+
<FaFormDialog
107+
ref="faFormDialogRef"
108+
v-model="form.data"
109+
:readonly="form.status === 'read'"
110+
:show.sync="form.show"
127111
:title="formTitle"
128-
:visible.sync="form.show"
112+
:retrieving="form.loading"
113+
:confirm="form.submit"
129114
>
130-
<el-form
131-
ref="formRef"
132-
v-loading="form.loading"
133-
:model="form.data"
134-
:disabled="form.status === 'read' || form.submitting"
115+
<el-form-item
116+
label="姓名"
117+
prop="name"
118+
required
135119
>
136-
<el-form-item
137-
label="姓名"
138-
prop="name"
139-
required
140-
>
141-
<el-input v-model="form.data.name" />
142-
</el-form-item>
143-
</el-form>
144-
<template #footer>
145-
<el-button @click="form.show = false">取 消</el-button>
146-
<el-button
147-
v-if="form.status !== 'read' && !form.loading"
148-
type="primary"
149-
:loading="form.submitting"
150-
@click="form.submit()"
151-
>
152-
确 定
153-
</el-button>
154-
</template>
155-
</el-dialog>
120+
<el-input v-model="form.data.name" />
121+
</el-form-item>
122+
</FaFormDialog>
156123
</div>
157124
</template>

‎demo/vue2.7/index.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ import 'uno.css'
55
import 'element-ui/lib/theme-chalk/index.css'
66
import ElementUI from 'element-ui'
77
import { FaFormDialog, FaSelect } from 'faim'
8+
import FaimLocale from 'faim/dist/locale/zh-cn.mjs'
89

910
import App from './index.vue'
1011
import router from './router'
1112

1213
Vue.use(ElementUI)
13-
Vue.use(FaFormDialog)
14-
Vue.use(FaSelect)
14+
Vue.use(FaFormDialog, { locale: FaimLocale.FaFormDialog })
15+
Vue.use(FaSelect, { locale: FaimLocale.FaSelect })
1516

1617
new Vue({
1718
render: h => h(App),

0 commit comments

Comments
 (0)