Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
submodule
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
web_component
submodule
Compare Revisions
patch_new_domain...master
Source
master
Select Git revision
...
Target
patch_new_domain
Select Git revision
Compare
Commits (5)
xiu
· 3877dbac
manzhenhua
authored
Jul 09, 2023
3877dbac
sub_domain_change
· 75d39d62
李晓静
authored
Jul 09, 2023
75d39d62
Merge branch 'master' of
http://apollo.mttop.cn/gitlab/web_component/submodule
· 33a6b90b
李晓静
authored
Jul 09, 2023
33a6b90b
合同用章
· bf680174
李晓静
authored
Jul 24, 2023
bf680174
domain
· 87f05065
李晓静
authored
Jul 24, 2023
87f05065
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
42 additions
and
42 deletions
+42
-42
README.md
README.md
+1
-1
index.js
ant_components/BIDatePicker/index.js
+2
-2
IconFont.js
components/CustomIcon/IconFont.js
+1
-1
config.js
components/CustomIcon/config.js
+29
-29
IconFont.ts
components/IconFont/IconFont.ts
+1
-1
fileType.ts
...nents/apolloTable/component/base/extra/upload/fileType.ts
+1
-1
index.tsx
components/dataView-V2/_components/filterCondition/index.tsx
+7
-7
No files found.
README.md
View file @
87f05065
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
## 子模块的添加
## 子模块的添加
*
本厂库作为主项目的submodule使用,在使用时,在项目中规范使用submodule目录作为该子模块的根目录
*
本厂库作为主项目的submodule使用,在使用时,在项目中规范使用submodule目录作为该子模块的根目录
*
切换至项目根目录
*
切换至项目根目录
*
git submodule add
<submoduleURL>
<submodulePATH>
我们约定 'git submodule add http://apollo.mttop.cn/gitlab/web_component/submodule.git src/submodule'
*
git submodule add
<submoduleURL>
<submodulePATH>
我们约定 'git submodule add http://apollo.mttop
group
.cn/gitlab/web_component/submodule.git src/submodule'
*
执行成功后 git status会看到项目中修改了.gitmodules,并增加了一个新文件(为刚刚添加的路径)即src下多了一个submodule的文件
*
执行成功后 git status会看到项目中修改了.gitmodules,并增加了一个新文件(为刚刚添加的路径)即src下多了一个submodule的文件
*
git diff --cached查看修改内容可以看到增加了子模块,并且新文件下为子模块的提交hash摘要
*
git diff --cached查看修改内容可以看到增加了子模块,并且新文件下为子模块的提交hash摘要
*
git commit提交即完成子模块的添加
*
git commit提交即完成子模块的添加
...
...
ant_components/BIDatePicker/index.js
View file @
87f05065
...
@@ -21,7 +21,7 @@ class BIDatePicker extends React.PureComponent {
...
@@ -21,7 +21,7 @@ class BIDatePicker extends React.PureComponent {
{...
this
.
props
}
{...
this
.
props
}
locale
=
{
zhCN
}
locale
=
{
zhCN
}
suffixIcon
=
{
suffixIcon
=
{
<
img
className
=
{
s
.
suffixIconSingle
}
alt
=
""
src
=
"https://static.mttop.cn/admin/calendar.png"
/>
<
img
className
=
{
s
.
suffixIconSingle
}
alt
=
""
src
=
"https://static.mttop
group
.cn/admin/calendar.png"
/>
}
}
/
>
/
>
<
/span
>
<
/span
>
...
@@ -37,7 +37,7 @@ class BIRangePicker extends React.PureComponent {
...
@@ -37,7 +37,7 @@ class BIRangePicker extends React.PureComponent {
{...
this
.
props
}
{...
this
.
props
}
locale
=
{
zhCN
}
locale
=
{
zhCN
}
suffixIcon
=
{
suffixIcon
=
{
<
img
className
=
{
s
.
suffixIcon
}
alt
=
""
src
=
"https://static.mttop.cn/admin/calendar.png"
/>
<
img
className
=
{
s
.
suffixIcon
}
alt
=
""
src
=
"https://static.mttop
group
.cn/admin/calendar.png"
/>
}
}
/
>
/
>
<
/span
>
<
/span
>
...
...
components/CustomIcon/IconFont.js
View file @
87f05065
import
{
createFromIconfontCN
}
from
'@ant-design/icons'
;
import
{
createFromIconfontCN
}
from
'@ant-design/icons'
;
const
IconFont
=
createFromIconfontCN
({
const
IconFont
=
createFromIconfontCN
({
scriptUrl
:
'https://static.mttop.cn/iconfont210309.js'
,
scriptUrl
:
'https://static.mttop
group
.cn/iconfont210309.js'
,
});
});
export
default
IconFont
;
export
default
IconFont
;
components/CustomIcon/config.js
View file @
87f05065
export
default
{
export
default
{
'buniness'
:
{
buniness
:
{
path
:
'https://static.mttop.cn/admin/buniness.png'
,
path
:
'https://static.mttop
group
.cn/admin/buniness.png'
,
selectedPath
:
'https://static.mttop.cn/admin/buniness_select.png'
,
selectedPath
:
'https://static.mttop
group
.cn/admin/buniness_select.png'
,
name
:
'业务管理'
,
name
:
'业务管理'
,
},
},
'approval'
:
{
approval
:
{
path
:
'https://static.mttop.cn/admin/approval.png'
,
path
:
'https://static.mttop
group
.cn/admin/approval.png'
,
selectedPath
:
'https://static.mttop.cn/admin/approval_select.png'
,
selectedPath
:
'https://static.mttop
group
.cn/admin/approval_select.png'
,
name
:
'审批管理'
,
name
:
'审批管理'
,
},
},
'message'
:
{
message
:
{
path
:
'https://static.mttop.cn/admin/news.png'
,
path
:
'https://static.mttop
group
.cn/admin/news.png'
,
selectedPath
:
'https://static.mttop.cn/admin/message_select.png'
,
selectedPath
:
'https://static.mttop
group
.cn/admin/message_select.png'
,
name
:
'消息管理'
,
name
:
'消息管理'
,
},
},
'software'
:
{
software
:
{
path
:
'https://static.mttop.cn/admin/software.png'
,
path
:
'https://static.mttop
group
.cn/admin/software.png'
,
selectedPath
:
'https://static.mttop.cn/admin/software_select.png'
,
selectedPath
:
'https://static.mttop
group
.cn/admin/software_select.png'
,
name
:
'应用管理'
,
name
:
'应用管理'
,
},
},
'org'
:
{
org
:
{
path
:
'https://static.mttop.cn/admin/org.png'
,
path
:
'https://static.mttop
group
.cn/admin/org.png'
,
selectedPath
:
'https://static.mttop.cn/admin/org_select.png'
,
selectedPath
:
'https://static.mttop
group
.cn/admin/org_select.png'
,
name
:
'应用管理'
,
name
:
'应用管理'
,
},
},
'admin_user'
:
{
admin_user
:
{
path
:
'https://static.mttop.cn/admin/admin_user.png'
,
path
:
'https://static.mttop
group
.cn/admin/admin_user.png'
,
selectedPath
:
'https://static.mttop.cn/admin/admin_user_select.png'
,
selectedPath
:
'https://static.mttop
group
.cn/admin/admin_user_select.png'
,
name
:
'应用管理'
,
name
:
'应用管理'
,
},
},
'shimo'
:
{
shimo
:
{
path
:
'https://static.mttop.cn/admin/new_shimo_2.png'
,
path
:
'https://static.mttop
group
.cn/admin/new_shimo_2.png'
,
selectedPath
:
'https://static.mttop.cn/admin/new_shimo_select.png'
,
selectedPath
:
'https://static.mttop
group
.cn/admin/new_shimo_select.png'
,
name
:
'应用管理'
,
name
:
'应用管理'
,
},
},
'calendar'
:
{
calendar
:
{
path
:
'https://static.mttop.cn/admin/new_calendar.png'
,
path
:
'https://static.mttop
group
.cn/admin/new_calendar.png'
,
selectedPath
:
'https://static.mttop.cn/admin/new_calendar_select.png'
,
selectedPath
:
'https://static.mttop
group
.cn/admin/new_calendar_select.png'
,
name
:
'应用管理'
,
name
:
'应用管理'
,
},
},
'approval'
:
{
approval
:
{
path
:
'https://static.mttop.cn/admin/approval_icon.png'
,
path
:
'https://static.mttop
group
.cn/admin/approval_icon.png'
,
selectedPath
:
'https://static.mttop.cn/admin/arrroval_icon_select.png'
,
selectedPath
:
'https://static.mttop
group
.cn/admin/arrroval_icon_select.png'
,
name
:
'应用管理'
,
name
:
'应用管理'
,
}
}
,
}
}
;
components/IconFont/IconFont.ts
View file @
87f05065
import
{
createFromIconfontCN
}
from
'@ant-design/icons'
;
import
{
createFromIconfontCN
}
from
'@ant-design/icons'
;
const
IconFont
=
createFromIconfontCN
({
const
IconFont
=
createFromIconfontCN
({
scriptUrl
:
'https://static.mttop.cn/iconfont210309.js'
,
scriptUrl
:
'https://static.mttop
group
.cn/iconfont210309.js'
,
});
});
export
default
IconFont
;
export
default
IconFont
;
components/apolloTable/component/base/extra/upload/fileType.ts
View file @
87f05065
const
CDN_PATH
=
'https://static.mttop.cn/admin'
;
const
CDN_PATH
=
'https://static.mttop
group
.cn/admin'
;
export
const
fileType
=
{
export
const
fileType
=
{
image
:
{},
image
:
{},
ppt
:
{
ppt
:
{
...
...
components/dataView-V2/_components/filterCondition/index.tsx
View file @
87f05065
import
React
,
{
Component
}
from
'react'
;
import
React
,
{
Component
}
from
'react'
;
import
{
Button
,
}
from
'antd'
;
import
{
Button
}
from
'antd'
;
// import ChooseItem from '@/components/choose-Item2';
// import ChooseItem from '@/components/choose-Item2';
import
styles
from
'./styles.less'
;
import
styles
from
'./styles.less'
;
// import { setSift } from '@/services/comment';
// import { setSift } from '@/services/comment';
// import { getOptionName } from '@/utils/utils';
// import { getOptionName } from '@/utils/utils';
// import { SIFT_TYPE } from '@/utils/enum';
// import { SIFT_TYPE } from '@/utils/enum';
/* eslint-disable react/sort-comp */
/* eslint-disable react/sort-comp */
const
searchIcon
=
'https://static.mttop.cn/admin/sousuo.png'
;
const
searchIcon
=
'https://static.mttop
group
.cn/admin/sousuo.png'
;
interface
Props
{
interface
Props
{
onSubmit
:
Function
onSubmit
:
Function
,
onResert
:
Function
onResert
:
Function
}
}
...
@@ -43,6 +43,6 @@ const FormFilterButton = (props: Props) => {
...
@@ -43,6 +43,6 @@ const FormFilterButton = (props: Props) => {
</
div
>
</
div
>
</>
</>
);
);
}
}
;
export
default
FormFilterButton
;
export
default
FormFilterButton
;