@yeeyoon/library 3.6.6 → 3.6.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/CommonModal/FixedVideo/index.jsx +71 -0
- package/lib/components/CommonModal/FixedVideo/styles.less +1933 -0
- package/lib/components/CommonModal/index.js +48 -0
- package/lib/components/CommonModal/styles.less +17 -0
- package/lib/components/Header/components/NewVersion/config.json +240 -0
- package/lib/components/Header/components/NewVersion/index.jsx +26 -2
- package/lib/components/Header/components/NewVersion/styles.less +32 -0
- package/lib/components/Header/index.jsx +14 -3
- package/lib/components/Header/utils.js +38 -6
- package/lib/components/Icons/index.jsx +5 -1
- package/package.json +4 -2
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* @Author: Erlin
|
|
3
|
+
* @Date: 2022-04-29 13:48:56
|
|
4
|
+
* @LastEditors: Erlin
|
|
5
|
+
* @LastEditTime: 2022-06-10 11:55:39
|
|
6
|
+
* @Description:
|
|
7
|
+
*/
|
|
8
|
+
import React from 'react';
|
|
9
|
+
import { Modal } from 'antd';
|
|
10
|
+
import FixedVideo from './FixedVideo';
|
|
11
|
+
import styles from './styles.less';
|
|
12
|
+
|
|
13
|
+
const openCustomModal = (props) => {
|
|
14
|
+
const { closable, width, Content, ...reset } = props;
|
|
15
|
+
const modal = Modal.warning({
|
|
16
|
+
title: null,
|
|
17
|
+
icon: null,
|
|
18
|
+
closable: closable,
|
|
19
|
+
keyboard: closable,
|
|
20
|
+
maskClosable: closable,
|
|
21
|
+
width: width,
|
|
22
|
+
okButtonProps: { style: { display: 'none' } },
|
|
23
|
+
content: (
|
|
24
|
+
<Content {...props.props} modal={modal} onClose={() => modal.destroy()} />
|
|
25
|
+
),
|
|
26
|
+
...reset,
|
|
27
|
+
});
|
|
28
|
+
};
|
|
29
|
+
|
|
30
|
+
const openVideoModal = (props) => {
|
|
31
|
+
const modal = Modal.warning({
|
|
32
|
+
title: null,
|
|
33
|
+
icon: null,
|
|
34
|
+
closable: true,
|
|
35
|
+
keyboard: true,
|
|
36
|
+
maskClosable: true,
|
|
37
|
+
width: 888,
|
|
38
|
+
centered: true,
|
|
39
|
+
className: styles.video_modal,
|
|
40
|
+
bodyStyle: { padding: 0 },
|
|
41
|
+
okButtonProps: { style: { display: 'none' } },
|
|
42
|
+
content: (
|
|
43
|
+
<FixedVideo {...props} modal={modal} onClose={() => modal.destroy()} />
|
|
44
|
+
),
|
|
45
|
+
});
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
export { openCustomModal, openVideoModal };
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
.video_modal {
|
|
2
|
+
:global {
|
|
3
|
+
.ant-modal-content {
|
|
4
|
+
background: transparent;
|
|
5
|
+
box-shadow: none;
|
|
6
|
+
}
|
|
7
|
+
.ant-modal-body {
|
|
8
|
+
padding: 0;
|
|
9
|
+
}
|
|
10
|
+
.ant-modal-close-x {
|
|
11
|
+
color: #666666;
|
|
12
|
+
font-size: 26px;
|
|
13
|
+
margin-top: -52px;
|
|
14
|
+
margin-right: -10px;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
@@ -0,0 +1,240 @@
|
|
|
1
|
+
[
|
|
2
|
+
{
|
|
3
|
+
"key": "bpm",
|
|
4
|
+
"tab": "智慧项目",
|
|
5
|
+
"content": [
|
|
6
|
+
{
|
|
7
|
+
"version": "V0.26.0",
|
|
8
|
+
"name": "智慧项目",
|
|
9
|
+
"icon": "icon-zhxm1",
|
|
10
|
+
"date": "2022/06/08",
|
|
11
|
+
"title": "收款和开票功能优化",
|
|
12
|
+
"mark": "1、铝模租赁--收款升级改版\n支持录入一笔收款时可选择多份合同、多个楼栋，并支持发起一次审批。减少重复录入、重复审批，让每笔收款更清晰；（对特定租户升级）。\n2、通用业务--开票功能优化\n支持申请开票审批通过后，不修改单据的情况下，上传发票附件及更新开票日期。",
|
|
13
|
+
"videos": [
|
|
14
|
+
{
|
|
15
|
+
"src": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/videos/bpm-v0.26.0.mp4",
|
|
16
|
+
"poster": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/poster/bpm-v0.26.0.jpg"
|
|
17
|
+
}
|
|
18
|
+
]
|
|
19
|
+
},
|
|
20
|
+
{
|
|
21
|
+
"version": "V0.29.0",
|
|
22
|
+
"name": "智慧项目",
|
|
23
|
+
"icon": "icon-zhxm1",
|
|
24
|
+
"date": "2022/06/17",
|
|
25
|
+
"title": "铝模租赁--开票升级改版",
|
|
26
|
+
"mark": "开票升级改版\n支持录入一笔开票时可选择多份合同、多个楼栋，并支持发起一次审批。减少重复录入、重复审批，让每笔开票更清晰；（对特定租户升级）"
|
|
27
|
+
},
|
|
28
|
+
{
|
|
29
|
+
"version": "V0.28.0",
|
|
30
|
+
"name": "智慧项目",
|
|
31
|
+
"icon": "icon-zhxm1",
|
|
32
|
+
"date": "2022/06/15",
|
|
33
|
+
"title": "首页上新",
|
|
34
|
+
"mark": "铝模租赁--首页上新\n对于铝模租赁业务模式，智慧项目增加首页功能。帮助用户更好的了解当前公司使用智慧项目情况，包括项目情况、合同情况、结算情况、数据情况、操作日志等。"
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
"version": "V0.27.0",
|
|
38
|
+
"name": "智慧项目",
|
|
39
|
+
"icon": "icon-zhxm1",
|
|
40
|
+
"date": "2022/06/10",
|
|
41
|
+
"title": "功能优化",
|
|
42
|
+
"mark": "1、通用业务--合同功能优化\n合同中合同及相关文件改为非必填，满足用户在未定稿的时候，录入合同信息。\n2、铝模租赁--分享功能优化\n增加订单新增功能，满足分享按照新增的订单分享项目的时候，可以按照订单分享（特定租户）。"
|
|
43
|
+
},
|
|
44
|
+
{
|
|
45
|
+
"version": "V0.25.0",
|
|
46
|
+
"name": "智慧项目",
|
|
47
|
+
"icon": "icon-zhxm1",
|
|
48
|
+
"date": "2022/06/02",
|
|
49
|
+
"title": "铝模租赁--付款升级改版",
|
|
50
|
+
"mark": "付款升级改版\n支持录入一笔付款时可选择多份合同、多个楼栋，并支持发起一次审批。减少重复录入、重复审批，让每笔付款更清晰；（对特定租户升级）",
|
|
51
|
+
"videos": [
|
|
52
|
+
{
|
|
53
|
+
"src": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/videos/bpm-v0.25.0.mp4",
|
|
54
|
+
"poster": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/poster/bpm-v0.25.0.jpg"
|
|
55
|
+
}
|
|
56
|
+
]
|
|
57
|
+
},
|
|
58
|
+
{
|
|
59
|
+
"version": "V0.24.0",
|
|
60
|
+
"name": "智慧项目",
|
|
61
|
+
"icon": "icon-zhxm1",
|
|
62
|
+
"date": "2022/05/27",
|
|
63
|
+
"title": "生产确认单上线",
|
|
64
|
+
"mark": "新增生产确认功能\n 特定租户，可在填写生产BOM单后向生产确认方发起生产确认，由生产确认方在宜建签盖章确认后，同步给发起方。"
|
|
65
|
+
},
|
|
66
|
+
{
|
|
67
|
+
"version": "V0.23.0",
|
|
68
|
+
"name": "智慧项目",
|
|
69
|
+
"icon": "icon-zhxm1",
|
|
70
|
+
"date": "2022/05/20",
|
|
71
|
+
"title": "统一分享功能及合同线上签署功能上线",
|
|
72
|
+
"mark": "1、新增分享数据功能\n 特定租户，特定情况下可分享本公司的信息给其他公司进行查看。\n 2、合同线上签署功能\n 特定租户，特定情况下可以线上签署合同，加盖电子签章，无需线下通过纸质版传递等。"
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
"version": "V0.21.0",
|
|
76
|
+
"name": "智慧项目",
|
|
77
|
+
"icon": "icon-zhxm1",
|
|
78
|
+
"date": "2022/04/02",
|
|
79
|
+
"title": "拓展多业务、多规模功能上线",
|
|
80
|
+
"mark": "1、满足多业务、多规模企业使用\n 支持铝模租赁行业、爬架行业、盘扣行业及其他行业的企业，可根据企业自身情况，选择不同业务模式，进行使用。\n 2、增加产品初始化及邀请用户功能\n 新公司入驻，可由公司管理员自主选择开通的行业及规模，且可通过分享 二维码的方式，邀请公司成员加入智慧项目。",
|
|
81
|
+
"videos": [
|
|
82
|
+
{
|
|
83
|
+
"src": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/videos/bpm-v0.21.0.mp4",
|
|
84
|
+
"poster": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/poster/bpm-v0.21.0.jpg"
|
|
85
|
+
}
|
|
86
|
+
]
|
|
87
|
+
},
|
|
88
|
+
{
|
|
89
|
+
"version": "V0.20.0",
|
|
90
|
+
"name": "智慧项目",
|
|
91
|
+
"icon": "icon-zhxm1",
|
|
92
|
+
"date": "2022/03/31",
|
|
93
|
+
"title": "钉钉审批相关功能上线",
|
|
94
|
+
"mark": "新增钉钉审批模块\n 特定租户，项目合同关联钉钉审批，可通过智慧项目发起，在钉钉内完成审批。",
|
|
95
|
+
"videos": [
|
|
96
|
+
{
|
|
97
|
+
"src": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/videos/bpm-v0.20.0.mp4",
|
|
98
|
+
"poster": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/poster/bpm-v0.20.0.jpg"
|
|
99
|
+
}
|
|
100
|
+
]
|
|
101
|
+
},
|
|
102
|
+
{
|
|
103
|
+
"version": "V0.18.0",
|
|
104
|
+
"name": "智慧项目",
|
|
105
|
+
"icon": "icon-zhxm1",
|
|
106
|
+
"date": "2021/12/22",
|
|
107
|
+
"title": "权限设置相关功能上线",
|
|
108
|
+
"mark": "1、新增全局权限设置\n 可对公司不同模块的数据，控制新增、编辑、管理权限，由公司管理员统一设置。\n 2、新增数据权限设置\n 可对单个项目及其关联数据，单独设置新增、编辑、管理权限，由项目的管理员设置。",
|
|
109
|
+
"videos": [
|
|
110
|
+
{
|
|
111
|
+
"src": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/videos/bpm-v0.18.0-1.mp4",
|
|
112
|
+
"poster": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/poster/bpm-v0.18.0-1.jpg"
|
|
113
|
+
},
|
|
114
|
+
{
|
|
115
|
+
"src": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/videos/bpm-v0.18.0-2.mp4",
|
|
116
|
+
"poster": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/poster/bpm-v0.18.0-2.jpg"
|
|
117
|
+
}
|
|
118
|
+
]
|
|
119
|
+
}
|
|
120
|
+
]
|
|
121
|
+
},
|
|
122
|
+
{
|
|
123
|
+
"key": "wms",
|
|
124
|
+
"tab": "智慧仓储",
|
|
125
|
+
"content": [
|
|
126
|
+
{
|
|
127
|
+
"version": "V0.7.0",
|
|
128
|
+
"name": "智慧仓储",
|
|
129
|
+
"icon": "icon-zhcc1",
|
|
130
|
+
"date": "2022/06/24",
|
|
131
|
+
"title": "箱包号和车辆信息优化",
|
|
132
|
+
"mark": "1、车辆信息优化\n支持收货、入库新增时，单独记录车辆信息，并选择该车装货的箱包情况；\n2、箱包号优化\n箱包查询模块，可根据箱包号查询在库箱包情况；"
|
|
133
|
+
},
|
|
134
|
+
{
|
|
135
|
+
"version": "V0.6.2",
|
|
136
|
+
"name": "智慧仓储",
|
|
137
|
+
"icon": "icon-zhcc1",
|
|
138
|
+
"date": "2022/06/10",
|
|
139
|
+
"title": "邀请用户功能上线",
|
|
140
|
+
"mark": "1、邀请用户功能\n邀请用户功能上线，可以通过分享小程序二维码邀请公司成员。\n2、库存增加箱包维度\n可以查看库存物资所在箱包，以及各箱包内的库存数据。"
|
|
141
|
+
},
|
|
142
|
+
{
|
|
143
|
+
"version": "V0.6.1",
|
|
144
|
+
"name": "智慧仓储",
|
|
145
|
+
"icon": "icon-zhcc1",
|
|
146
|
+
"date": "2022/06/02",
|
|
147
|
+
"title": "审批拒绝单据修改功能上线",
|
|
148
|
+
"mark": "1、审批拒绝单据修改功能\n审批拒绝的单据增加修改功能，修改后可以重新发起审批。\n2、新增单据类型\n新增调拨、置换单据类型，满足调拨收货、调拨入库、调拨出库，以及置换收货、置换入库、置换出库业务场景。"
|
|
149
|
+
},
|
|
150
|
+
{
|
|
151
|
+
"version": "V0.6.0",
|
|
152
|
+
"name": "智慧仓储",
|
|
153
|
+
"icon": "icon-zhcc1",
|
|
154
|
+
"date": "2022/05/27",
|
|
155
|
+
"title": "存草稿&重点跟进功能上线",
|
|
156
|
+
"mark": "新增存草稿&重点跟进功能\n 在新增业务单据时，随时可以保存草稿，不用再担心因为操作中断，需要重新填写。"
|
|
157
|
+
},
|
|
158
|
+
{
|
|
159
|
+
"version": "V0.5.0",
|
|
160
|
+
"name": "智慧仓储",
|
|
161
|
+
"icon": "icon-zhcc1",
|
|
162
|
+
"date": "2022/05/20",
|
|
163
|
+
"title": "物资分布图上线",
|
|
164
|
+
"mark": "物资分布图\n 将物资的在库分布及租出分布可视化，能够清晰掌握所有物资的分布情况。"
|
|
165
|
+
},
|
|
166
|
+
{
|
|
167
|
+
"version": "V0.4.0",
|
|
168
|
+
"name": "智慧仓储",
|
|
169
|
+
"icon": "icon-zhcc1",
|
|
170
|
+
"date": "2022/05/13",
|
|
171
|
+
"title": "数据初始化功能上线",
|
|
172
|
+
"mark": "1、数据初始化\n 通过初始化仓库、物资分类、属性、物资、库存，将期初数据导入系统。\n 2、从智慧项目获取项目数据\n 新增业务单据时的项目信息可以从智慧项目系统中查询获取。"
|
|
173
|
+
},
|
|
174
|
+
{
|
|
175
|
+
"version": "V0.3.0",
|
|
176
|
+
"name": "智慧仓储",
|
|
177
|
+
"icon": "icon-zhcc1",
|
|
178
|
+
"date": "2022/05/07",
|
|
179
|
+
"title": "钉钉审批功能上线",
|
|
180
|
+
"mark": "钉钉审批\n 系统对接钉钉审批流，已完成的单据可以发起审批，并在钉钉中进行同意或拒绝操作。"
|
|
181
|
+
}
|
|
182
|
+
]
|
|
183
|
+
},
|
|
184
|
+
{
|
|
185
|
+
"key": "bee",
|
|
186
|
+
"tab": "建筑蜂",
|
|
187
|
+
"content": [
|
|
188
|
+
{
|
|
189
|
+
"version": "V5.0.0",
|
|
190
|
+
"name": "建筑蜂",
|
|
191
|
+
"icon": "icon-jzf1",
|
|
192
|
+
"date": "2022/05/27",
|
|
193
|
+
"title": "小程序收货功能上线",
|
|
194
|
+
"mark": "新增小程序收货功能\n 移动端操作收货，现场操作更及时、更便捷。",
|
|
195
|
+
"videos": [
|
|
196
|
+
{
|
|
197
|
+
"src": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/videos/bee-v5.0.0.mp4",
|
|
198
|
+
"poster": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/poster/bee-v5.0.0.jpg"
|
|
199
|
+
}
|
|
200
|
+
]
|
|
201
|
+
},
|
|
202
|
+
{
|
|
203
|
+
"version": "V4.2.0",
|
|
204
|
+
"name": "建筑蜂",
|
|
205
|
+
"icon": "icon-jzf1",
|
|
206
|
+
"date": "2022/04/29",
|
|
207
|
+
"title": "首页全新改版",
|
|
208
|
+
"mark": "增加我的收藏和最近使用功能，让用户快速找到自己需要的应用。",
|
|
209
|
+
"videos": [
|
|
210
|
+
{
|
|
211
|
+
"src": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/videos/bee-v4.2.0.mp4",
|
|
212
|
+
"poster": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/poster/bee-v4.2.0.jpg"
|
|
213
|
+
}
|
|
214
|
+
]
|
|
215
|
+
},
|
|
216
|
+
{
|
|
217
|
+
"version": "V4.0.0",
|
|
218
|
+
"name": "建筑蜂",
|
|
219
|
+
"icon": "icon-jzf1",
|
|
220
|
+
"date": "2022/04/15",
|
|
221
|
+
"title": "施工进度全新改版",
|
|
222
|
+
"mark": "通过任务方式下发需要填报的施工内容，让用户快速了解自己需要完成的任务，且下发任务周期由公司管理员制定。",
|
|
223
|
+
"videos": [
|
|
224
|
+
{
|
|
225
|
+
"src": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/videos/bee-v4.0.0.mp4",
|
|
226
|
+
"poster": "https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/releases/poster/bee-v4.0.0.jpg"
|
|
227
|
+
}
|
|
228
|
+
]
|
|
229
|
+
},
|
|
230
|
+
{
|
|
231
|
+
"version": "V3.8.0",
|
|
232
|
+
"name": "建筑蜂",
|
|
233
|
+
"icon": "icon-jzf1",
|
|
234
|
+
"date": "2022/03/31",
|
|
235
|
+
"title": "实现扫描二维码注册智慧项目",
|
|
236
|
+
"mark": "通过扫描小程序二维码，可以注册智慧项目并使用。"
|
|
237
|
+
}
|
|
238
|
+
]
|
|
239
|
+
}
|
|
240
|
+
]
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import ls from 'local-storage';
|
|
2
|
+
// import ls from 'local-storage';
|
|
3
3
|
import PropTypes from 'prop-types';
|
|
4
4
|
import styles from './styles.less';
|
|
5
|
+
import { openVideoModal } from '../../../CommonModal';
|
|
6
|
+
import { IconPlay } from '../../../Icons';
|
|
5
7
|
|
|
6
8
|
const NewVersion = (props) => {
|
|
7
9
|
const { onClose, data, toVersionCenter } = props;
|
|
8
10
|
|
|
9
11
|
const handleToVersionCenter = () => {
|
|
10
|
-
ls.set('Yyun-Version', data.version);
|
|
11
12
|
toVersionCenter();
|
|
12
13
|
onClose();
|
|
13
14
|
};
|
|
@@ -19,6 +20,29 @@ const NewVersion = (props) => {
|
|
|
19
20
|
className={styles.rocket}
|
|
20
21
|
src="https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/version-rocket.png"
|
|
21
22
|
/>
|
|
23
|
+
<div className={styles.videos}>
|
|
24
|
+
{data.videos?.length && (
|
|
25
|
+
<div
|
|
26
|
+
className={styles.video_warp}
|
|
27
|
+
onClick={() => {
|
|
28
|
+
openVideoModal({
|
|
29
|
+
src: data.videos[0].src,
|
|
30
|
+
poster: data.videos[0].poster,
|
|
31
|
+
type: 'video/MP4',
|
|
32
|
+
});
|
|
33
|
+
}}
|
|
34
|
+
>
|
|
35
|
+
<img
|
|
36
|
+
alt="poster"
|
|
37
|
+
src={data.videos[0].poster}
|
|
38
|
+
className={styles.poster}
|
|
39
|
+
/>
|
|
40
|
+
<div className={styles.play}>
|
|
41
|
+
<IconPlay styles={{ fontSize: '36px' }} />
|
|
42
|
+
</div>
|
|
43
|
+
</div>
|
|
44
|
+
)}
|
|
45
|
+
</div>
|
|
22
46
|
<div className={styles.title}>{data.title}</div>
|
|
23
47
|
<div className={styles.mark}>{data.mark}</div>
|
|
24
48
|
<div className={styles.footer}>
|
|
@@ -42,3 +42,35 @@
|
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
+
|
|
46
|
+
.video_warp {
|
|
47
|
+
margin-top: 24px;
|
|
48
|
+
display: inline-block;
|
|
49
|
+
width: 100%;
|
|
50
|
+
height: auto;
|
|
51
|
+
background: rgba(0, 0, 0, 0.4);
|
|
52
|
+
border-radius: 6px;
|
|
53
|
+
position: relative;
|
|
54
|
+
cursor: pointer;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
.poster {
|
|
58
|
+
width: 100%;
|
|
59
|
+
height: 100%;
|
|
60
|
+
// object-fit: cover;
|
|
61
|
+
border-radius: 6px;
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
.play {
|
|
65
|
+
position: absolute;
|
|
66
|
+
top: 0;
|
|
67
|
+
left: 0;
|
|
68
|
+
width: 100%;
|
|
69
|
+
height: 100%;
|
|
70
|
+
display: flex;
|
|
71
|
+
justify-content: center;
|
|
72
|
+
align-items: center;
|
|
73
|
+
background: rgba(0, 0, 0, 0.4);
|
|
74
|
+
border-radius: 6px;
|
|
75
|
+
font-size: 36px;
|
|
76
|
+
}
|
|
@@ -87,6 +87,7 @@ const Header = (props) => {
|
|
|
87
87
|
const [avatarProps, setAvatarProps] = useState({});
|
|
88
88
|
const [redirectUrl, setRedirectUrl] = useState('');
|
|
89
89
|
const [hasNewVersion, setHasNewVersion] = useState(false);
|
|
90
|
+
const [versionObj, setVersionObj] = useState({});
|
|
90
91
|
|
|
91
92
|
const menu = (
|
|
92
93
|
<Menu>
|
|
@@ -127,9 +128,10 @@ const Header = (props) => {
|
|
|
127
128
|
|
|
128
129
|
useEffect(async () => {
|
|
129
130
|
getUserInfo();
|
|
130
|
-
const [
|
|
131
|
-
setHasNewVersion(
|
|
132
|
-
|
|
131
|
+
const [isNew, newData, hasRead] = await getVersionData(productName);
|
|
132
|
+
setHasNewVersion(isNew);
|
|
133
|
+
setVersionObj(newData);
|
|
134
|
+
if (!hasRead) {
|
|
133
135
|
openVersionModal({
|
|
134
136
|
data: newData,
|
|
135
137
|
setHasNewVersion,
|
|
@@ -256,6 +258,15 @@ const Header = (props) => {
|
|
|
256
258
|
|
|
257
259
|
const toVersionCenter = () => {
|
|
258
260
|
setHasNewVersion(false);
|
|
261
|
+
if (productName === 'profile') {
|
|
262
|
+
ls.set('Yyun-Version', versionObj);
|
|
263
|
+
} else {
|
|
264
|
+
ls.set('Yyun-Version', {
|
|
265
|
+
...(ls.get('Yyun-Version') || {}),
|
|
266
|
+
hasRead: true,
|
|
267
|
+
isNew: false,
|
|
268
|
+
});
|
|
269
|
+
}
|
|
259
270
|
let system = '';
|
|
260
271
|
switch (productName) {
|
|
261
272
|
case 'bpm':
|
|
@@ -12,9 +12,10 @@ import ls from 'local-storage';
|
|
|
12
12
|
import request from '.././../utils/request';
|
|
13
13
|
import NewVersion from './components/NewVersion';
|
|
14
14
|
import styles from './components/NewVersion/styles.less';
|
|
15
|
+
// import config from './components/NewVersion/config.json';
|
|
15
16
|
|
|
16
17
|
export const openVersionModal = async (props) => {
|
|
17
|
-
const { data,
|
|
18
|
+
const { data, toVersionCenter, ...reset } = props;
|
|
18
19
|
const modal = Modal.warning({
|
|
19
20
|
centered: true,
|
|
20
21
|
width: 400,
|
|
@@ -35,8 +36,11 @@ export const openVersionModal = async (props) => {
|
|
|
35
36
|
/>
|
|
36
37
|
),
|
|
37
38
|
onCancel: () => {
|
|
38
|
-
setHasNewVersion(false);
|
|
39
|
-
ls.set('Yyun-Version',
|
|
39
|
+
// setHasNewVersion(false);
|
|
40
|
+
ls.set('Yyun-Version', {
|
|
41
|
+
...(ls.get('Yyun-Version') || {}),
|
|
42
|
+
hasRead: true,
|
|
43
|
+
});
|
|
40
44
|
},
|
|
41
45
|
...reset,
|
|
42
46
|
});
|
|
@@ -44,6 +48,7 @@ export const openVersionModal = async (props) => {
|
|
|
44
48
|
|
|
45
49
|
export const getVersionData = async (productName) => {
|
|
46
50
|
const systems = ['bpm', 'wms', 'bee'];
|
|
51
|
+
// let hasRead = false;
|
|
47
52
|
if (systems.indexOf(productName) > -1) {
|
|
48
53
|
const oldData = ls.get('Yyun-Version');
|
|
49
54
|
const res = await request(
|
|
@@ -52,8 +57,35 @@ export const getVersionData = async (productName) => {
|
|
|
52
57
|
);
|
|
53
58
|
const items = lodash.find(res, (item) => item.key == productName);
|
|
54
59
|
const newData = items?.content?.[0] || {};
|
|
55
|
-
|
|
56
|
-
|
|
60
|
+
if (oldData?.version !== newData?.version) {
|
|
61
|
+
const data = {
|
|
62
|
+
version: newData?.version,
|
|
63
|
+
hasRead: false,
|
|
64
|
+
isNew: true,
|
|
65
|
+
};
|
|
66
|
+
ls.set('Yyun-Version', data);
|
|
67
|
+
}
|
|
68
|
+
if (oldData) return [oldData.isNew, newData, oldData.hasRead];
|
|
69
|
+
return [false, newData, true];
|
|
57
70
|
}
|
|
58
|
-
|
|
71
|
+
if (productName == 'profile') {
|
|
72
|
+
const res = await request(
|
|
73
|
+
'https://prod-yeeyoon-oss.oss-cn-zhangjiakou.aliyuncs.com/newbie/version-center.json',
|
|
74
|
+
{ prefix: '' }
|
|
75
|
+
);
|
|
76
|
+
let oldVersion = ls.get('Yyun-Version');
|
|
77
|
+
let versionObj = {};
|
|
78
|
+
let flag = false;
|
|
79
|
+
res.forEach((data) => {
|
|
80
|
+
const hasNew =
|
|
81
|
+
data.content[0].version !== oldVersion?.[data.key]?.version;
|
|
82
|
+
if (hasNew) flag = true;
|
|
83
|
+
versionObj[data.key] = {
|
|
84
|
+
version: data.content[0].version,
|
|
85
|
+
// hasNew: hasNew,
|
|
86
|
+
};
|
|
87
|
+
});
|
|
88
|
+
return [flag, versionObj, true];
|
|
89
|
+
}
|
|
90
|
+
return [false, {}, true];
|
|
59
91
|
};
|
|
@@ -4,7 +4,7 @@ import { createFromIconfontCN } from '@ant-design/icons';
|
|
|
4
4
|
const Icons = createFromIconfontCN({
|
|
5
5
|
scriptUrl: [
|
|
6
6
|
'//at.alicdn.com/t/font_3133477_q292mp6e2u.js',
|
|
7
|
-
'//at.alicdn.com/t/
|
|
7
|
+
'//at.alicdn.com/t/font_2716486_438w28vpft3.js',
|
|
8
8
|
'//at.alicdn.com/t/font_2832661_kmrn4o901g.js', //宜云协同iconfont
|
|
9
9
|
'//at.alicdn.com/t/font_2832313_vjeg45f5qof.js',
|
|
10
10
|
'//at.alicdn.com/t/font_2965204_9g0wekoduag.js', //租户管理
|
|
@@ -38,6 +38,9 @@ const IconQunZuGuanLi = (args) => {
|
|
|
38
38
|
const IconVersion = (args) => {
|
|
39
39
|
return <Icons type="icon-tag" {...args} />;
|
|
40
40
|
};
|
|
41
|
+
const IconPlay = (args) => {
|
|
42
|
+
return <Icons type="icon-bofang" {...args} />;
|
|
43
|
+
};
|
|
41
44
|
const IconNew = () => {
|
|
42
45
|
return (
|
|
43
46
|
<svg
|
|
@@ -58,6 +61,7 @@ const IconNew = () => {
|
|
|
58
61
|
export {
|
|
59
62
|
IconBell,
|
|
60
63
|
IconTodo,
|
|
64
|
+
IconPlay,
|
|
61
65
|
IconConsole,
|
|
62
66
|
IconMore,
|
|
63
67
|
IconCircle,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yeeyoon/library",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.7",
|
|
4
4
|
"description": "宜云前端组件库和通用服务",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"repository": {
|
|
@@ -35,7 +35,9 @@
|
|
|
35
35
|
"recharts": "^1.8.5",
|
|
36
36
|
"socket.io-client": "^4.1.2",
|
|
37
37
|
"umi-request": "^1.3.9",
|
|
38
|
-
"uuid": "^8.3.2"
|
|
38
|
+
"uuid": "^8.3.2",
|
|
39
|
+
"video.js": "^7.15.4",
|
|
40
|
+
"videojs-flash": "^2.2.1"
|
|
39
41
|
},
|
|
40
42
|
"devDependencies": {
|
|
41
43
|
"babel-eslint": "^9.0.0",
|