Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
najiu-admin-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
najiu-frontend
najiu-admin-template
Commits
be2b8a7e
Commit
be2b8a7e
authored
Nov 18, 2020
by
vben
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: integrate upload components into form by default
parent
99303a99
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
15 deletions
+15
-15
CHANGELOG.zh_CN.md
CHANGELOG.zh_CN.md
+1
-0
FormItem.tsx
src/components/Form/src/FormItem.tsx
+1
-1
componentMap.ts
src/components/Form/src/componentMap.ts
+3
-0
data.tsx
src/components/Upload/src/data.tsx
+5
-2
index.vue
src/views/demo/comp/upload/index.vue
+5
-12
No files found.
CHANGELOG.zh_CN.md
View file @
be2b8a7e
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
-
新增个人页
-
新增个人页
-
新增表单页
-
新增表单页
-
新增详情页
-
新增详情页
-
将上传组件默认集成到 form
### 🎫 Chores
### 🎫 Chores
...
...
src/components/Form/src/FormItem.tsx
View file @
be2b8a7e
...
@@ -158,7 +158,7 @@ export default defineComponent({
...
@@ -158,7 +158,7 @@ export default defineComponent({
)
{
)
{
rule
.
type
=
'
object
'
;
rule
.
type
=
'
object
'
;
}
}
if
(
component
.
includes
(
'
RangePicker
'
))
{
if
(
component
.
includes
(
'
RangePicker
'
)
||
component
.
includes
(
'
Upload
'
)
)
{
rule
.
type
=
'
array
'
;
rule
.
type
=
'
array
'
;
}
}
if
(
component
.
includes
(
'
InputNumber
'
))
{
if
(
component
.
includes
(
'
InputNumber
'
))
{
...
...
src/components/Form/src/componentMap.ts
View file @
be2b8a7e
...
@@ -18,6 +18,7 @@ import {
...
@@ -18,6 +18,7 @@ import {
TreeSelect
,
TreeSelect
,
}
from
'
ant-design-vue
'
;
}
from
'
ant-design-vue
'
;
import
RadioButtonGroup
from
'
./components/RadioButtonGroup.vue
'
;
import
RadioButtonGroup
from
'
./components/RadioButtonGroup.vue
'
;
import
{
BasicUpload
}
from
'
/@/components/Upload
'
;
const
componentMap
=
new
Map
<
ComponentType
,
any
>
();
const
componentMap
=
new
Map
<
ComponentType
,
any
>
();
...
@@ -48,6 +49,8 @@ componentMap.set('RangePicker', DatePicker.RangePicker);
...
@@ -48,6 +49,8 @@ componentMap.set('RangePicker', DatePicker.RangePicker);
componentMap
.
set
(
'
WeekPicker
'
,
DatePicker
.
WeekPicker
);
componentMap
.
set
(
'
WeekPicker
'
,
DatePicker
.
WeekPicker
);
componentMap
.
set
(
'
TimePicker
'
,
TimePicker
);
componentMap
.
set
(
'
TimePicker
'
,
TimePicker
);
componentMap
.
set
(
'
Upload
'
,
BasicUpload
);
export
function
add
(
compName
:
ComponentType
,
component
:
Component
)
{
export
function
add
(
compName
:
ComponentType
,
component
:
Component
)
{
componentMap
.
set
(
compName
,
component
);
componentMap
.
set
(
compName
,
component
);
}
}
...
...
src/components/Upload/src/data.tsx
View file @
be2b8a7e
import
type
{
BasicColumn
,
ActionItem
}
from
'
/@/components/Table
'
;
import
{
FileItem
,
PreviewFileItem
,
UploadResultStatus
}
from
'
./types
'
;
import
{
checkImgType
,
isImgTypeByName
}
from
'
./utils
'
;
import
{
checkImgType
,
isImgTypeByName
}
from
'
./utils
'
;
import
{
Progress
,
Tag
}
from
'
ant-design-vue
'
;
import
{
Progress
,
Tag
}
from
'
ant-design-vue
'
;
import
{
FileItem
,
PreviewFileItem
,
UploadResultStatus
}
from
'
./types
'
;
import
{
BasicColumn
,
ActionItem
,
TableAction
}
from
'
/@/components/Table/index
'
;
import
TableAction
from
'
/@/components/Table/src/components/TableAction
'
;
// 文件上传列表
// 文件上传列表
export
function
createTableColumns
():
BasicColumn
[]
{
export
function
createTableColumns
():
BasicColumn
[]
{
...
...
src/views/demo/comp/upload/index.vue
View file @
be2b8a7e
...
@@ -9,31 +9,24 @@
...
@@ -9,31 +9,24 @@
</div>
</div>
</
template
>
</
template
>
<
script
lang=
"ts"
>
<
script
lang=
"ts"
>
import
{
defineComponent
,
h
}
from
'
vue
'
;
import
{
defineComponent
}
from
'
vue
'
;
import
{
BasicUpload
}
from
'
/@/components/Upload
'
;
import
{
BasicUpload
}
from
'
/@/components/Upload
'
;
import
{
useMessage
}
from
'
/@/hooks/web/useMessage
'
;
import
{
useMessage
}
from
'
/@/hooks/web/useMessage
'
;
import
{
BasicForm
,
FormSchema
,
useForm
}
from
'
/@/components/Form/index
'
;
import
{
BasicForm
,
FormSchema
,
useForm
}
from
'
/@/components/Form/index
'
;
import
{
uploadApi
}
from
'
/@/api/sys/upload
'
;
import
{
uploadApi
}
from
'
/@/api/sys/upload
'
;
// import { Alert } from 'ant-design-vue';
const
schemas
:
FormSchema
[]
=
[
const
schemas
:
FormSchema
[]
=
[
{
{
field
:
'
field1
'
,
field
:
'
field1
'
,
component
:
'
Input
'
,
component
:
'
Upload
'
,
label
:
'
字段1
'
,
label
:
'
字段1
'
,
colProps
:
{
colProps
:
{
span
:
8
,
span
:
8
,
},
},
rules
:
[{
required
:
true
,
type
:
'
array
'
,
message
:
'
请选择上传文件
'
}],
rules
:
[{
required
:
true
,
message
:
'
请选择上传文件
'
}],
render
:
({
model
,
field
})
=>
{
componentProps
:
{
return
h
(
BasicUpload
,
{
api
:
uploadApi
,
value
:
model
[
field
],
api
:
uploadApi
,
onChange
:
(
val
:
string
[])
=>
{
model
[
field
]
=
val
;
},
});
},
},
},
},
];
];
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment