dlt-for-react 1.0.8 → 1.0.10

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.
Files changed (5) hide show
  1. package/README.md +44 -24
  2. package/lib/layouts/layout/index.js +441 -398
  3. package/lib/layouts/settingDrawer/fontChange.js +90 -78
  4. package/lib/utils/index.js +44 -9
  5. package/package.json +1 -1
package/README.md CHANGED
@@ -1,45 +1,65 @@
1
1
  #### 安装
2
+
2
3
  cnpm install dlt-for-react --save
3
4
 
4
5
  #### 发布
6
+
5
7
  npm publish
6
8
 
7
- ## 前端dlt-for-react依赖包版本更新记录
9
+ ## 前端 dlt-for-react 依赖包版本更新记录
8
10
 
9
- ##### 当前最新版本：1.0.8
11
+ ##### 当前最新版本：1.0.10
10
12
 
11
13
  ##### 安装依赖
14
+
12
15
  > cnpm install dlt-for-react --save
13
16
 
14
17
  ##### 版本修改记录
15
- #### V1.0.7—2023年10月12日
16
- 1. 提交HqLsrySelector临时人员选择器组件
17
- #### V1.0.6—2023年10月9日
18
- 1. 修改createUuid参数bug
19
- #### V1.0.4—2023年9月28日
20
- 1. 补充KyBtnBox、KyCheckBox、KyCheckButton、KyCollapse、KyContainerFrame、KyEditableTable、KyEmpty、KyExcel、KyIcon、KyMore、KyTable及KyTitle组件
21
- #### V1.0.3—2023年9月28日
22
- 1. 补充KyInputPicker、KyModal、KyUpload及KyPreview组件
23
- #### V1.0.2—2023年9月27日
18
+
19
+ #### V1.0.10—2023 年 10 月 19 日
20
+
21
+ 1. 修改获取参数配置请求接口的服务
22
+ 2. 将字号适配默认 54 号改成 75 号
23
+ 3. 新增设备判断封装函数
24
+
25
+ #### V1.0.7—2023 年 10 月 12 日
26
+
27
+ 1. 提交 HqLsrySelector 临时人员选择器组件
28
+
29
+ #### V1.0.6—2023 年 10 月 9 日
30
+
31
+ 1. 修改 createUuid 参数 bug
32
+
33
+ #### V1.0.4—2023 年 9 月 28 日
34
+
35
+ 1. 补充 KyBtnBox、KyCheckBox、KyCheckButton、KyCollapse、KyContainerFrame、KyEditableTable、KyEmpty、KyExcel、KyIcon、KyMore、KyTable 及 KyTitle 组件
36
+
37
+ #### V1.0.3—2023 年 9 月 28 日
38
+
39
+ 1. 补充 KyInputPicker、KyModal、KyUpload 及 KyPreview 组件
40
+
41
+ #### V1.0.2—2023 年 9 月 27 日
42
+
24
43
  1. 初始化组件
44
+
25
45
  ## 发布
26
46
 
27
- ### npm官网路径
47
+ ### npm 官网路径
28
48
 
29
49
  - 路径：https://www.npmjs.com/package/dlt-for-react
30
50
  - 账号密码：yizhiqiang/yzq7900285
31
51
 
32
- ### cnpm路径
52
+ ### cnpm 路径
33
53
 
34
54
  - 路径：https://npmmirror.com/package/dlt-for-react
35
55
 
36
- ### 发布到NPM仓库（若npm已登录则忽略1、2、3步）
56
+ ### 发布到 NPM 仓库（若 npm 已登录则忽略 1、2、3 步）
37
57
 
38
- 1. 在cmd执行：
58
+ 1. 在 cmd 执行：
39
59
 
40
60
  > npm config set registry https://registry.npmjs.org/
41
61
 
42
- 2. 在发布项目执行npm登录：
62
+ 2. 在发布项目执行 npm 登录：
43
63
 
44
64
  ```
45
65
  F:\webstrom\dlt-for-react>npm login
@@ -48,17 +68,17 @@ Password: lianyi@dev02
48
68
  Email: (this IS public) lianyi_dev02@163.com
49
69
  ```
50
70
 
51
- 若提示需要one-time password就登录下方邮箱查看验证码,输入对应的one-time password即可，其他提示的话可能是密码输错了或网络问题；
71
+ 若提示需要 one-time password 就登录下方邮箱查看验证码,输入对应的 one-time password 即可，其他提示的话可能是密码输错了或网络问题；
52
72
 
53
73
  ```
54
74
  邮箱：lianyi_dev02@163.com
55
75
  密码：lianyi@dev02 （用于接收验证码）
56
76
  ```
57
77
 
58
- 3. 在package.json中修改版本号
59
- 4. 执行npm publish命令`<br>`
78
+ 3. 在 package.json 中修改版本号
79
+ 4. 执行 npm publish 命令`<br>`
60
80
  （切记先更新再发布，避免代码遗漏）
61
- 5. 手动同步到cnpm镜像`<br>`
81
+ 5. 手动同步到 cnpm 镜像`<br>`
62
82
  - 同步地址：https://npmmirror.com/sync/dlt-for-react
63
83
 
64
84
  ### 发布到公司私服仓库（敏捷开发平台使用私服拉取）
@@ -68,15 +88,15 @@ Email: (this IS public) lianyi_dev02@163.com
68
88
  输入用户名、密码、邮箱
69
89
 
70
90
  ```
71
- E:\git\dlt-for-react>npm login -registry=http://192.168.30.58:8081/repository/npm-repository/
91
+ E:\git\dlt-for-react>npm login -registry=http://192.168.30.58:8081/repository/npm-repository/
72
92
  Username: xuegong-dev
73
93
  Password: xuegongdev123
74
94
  Email: xuwei@ly-sky.com
75
95
  ```
76
96
 
77
- 3. 在package.json中修改版本号
78
- 4. 执行npm publish -registry=http://192.168.30.58:8081/repository/npm-repository/`<br>`
97
+ 3. 在 package.json 中修改版本号
98
+ 4. 执行 npm publish -registry=http://192.168.30.58:8081/repository/npm-repository/`<br>`
79
99
  （切记先更新再发布，避免代码遗漏）
80
100
  5. 查看访问私服仓库查看是否成功`<br>`
81
101
 
82
- - http://192.168.30.58:8081/#browse/browse:npm-repository:dlt-for-react
102
+ - http://192.168.30.58:8081/#browse/browse:npm-repository:dlt-for-react
package/lib/layouts/layout/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
3
  Object.defineProperty(exports, "__esModule", {
4
- value: true
4
+ value: true
5
5
  });
6
6
  exports.default = undefined;
7
7
 
@@ -107,414 +107,457 @@ var Sider = _layout2.default.Sider,
107
107
  // 默认配置
108
108
 
109
109
  var defaultSetting = {
110
- title: "学工UI风格",
111
- navTheme: "dark", // theme for nav menu 主题 dark or light
112
- layout: "sidemenu", // nav menu position: sidemenu or topmenu or mixmenu 菜单位置 侧边菜单 顶部菜单 混合模式（侧边菜单+顶部logo）
113
- contentWidth: "Fluid", // layout of content: Fluid or Fixed, only works when layout is topmenu 页面内容宽度
114
- fixedHeader: false, // sticky header 是否固定header
115
- autoHideHeader: false, // auto hide header 是否自动隐藏header
116
- fixSiderbar: false, // sticky siderbar 是否固定侧边栏
117
- primaryColor: '#1890ff', //primary-Color 全局主题色 --新版设计规范默认主色联奕蓝#397ef0
118
- fontSize: 'default' //字号 default/big (默认字号+5)/huge（默认字号+15）
110
+ title: '学工UI风格',
111
+ navTheme: 'dark', // theme for nav menu 主题 dark or light
112
+ layout: 'sidemenu', // nav menu position: sidemenu or topmenu or mixmenu 菜单位置 侧边菜单 顶部菜单 混合模式（侧边菜单+顶部logo）
113
+ contentWidth: 'Fluid', // layout of content: Fluid or Fixed, only works when layout is topmenu 页面内容宽度
114
+ fixedHeader: false, // sticky header 是否固定header
115
+ autoHideHeader: false, // auto hide header 是否自动隐藏header
116
+ fixSiderbar: false, // sticky siderbar 是否固定侧边栏
117
+ primaryColor: '#1890ff', //primary-Color 全局主题色 --新版设计规范默认主色联奕蓝#397ef0
118
+ fontSize: 'default' //字号 default/big (默认字号+5)/huge（默认字号+15）
119
119
  };
120
120
 
121
121
  var NHLayout = function (_React$Component) {
122
- (0, _inherits3.default)(NHLayout, _React$Component);
123
-
124
- function NHLayout(props) {
125
- (0, _classCallCheck3.default)(this, NHLayout);
126
-
127
- var _this = (0, _possibleConstructorReturn3.default)(this, (NHLayout.__proto__ || (0, _getPrototypeOf2.default)(NHLayout)).call(this, props));
128
-
129
- _this.getLayoutSetting = function () {
130
- _this.setState({ layoutShow: false });
131
- (0, _NHFetch3.default)('api/zhxg-xtgl/openapi/getCsszByCsbz', 'GET', { csbz: 'XTGL_LAYOUT_SETTING' }).then(function (res) {
132
- if (res && res.code === 200 && res.data) {
133
- var initSetting = res.data.csz ? JSON.parse(res.data.csz) : defaultSetting;
134
- sessionStorage.setItem('setting', (0, _stringify2.default)(initSetting));
135
- _this.setState({
136
- setting: initSetting,
137
- csszxid: res.data.pkid ? res.data.pkid : '',
138
- prevSetting: (0, _stringify2.default)(initSetting)
139
- }, function () {
140
- _this.changeBaseFontSize(initSetting.fontSize);
141
- if (window.less && window.less.modifyVars) {
142
- window.less.modifyVars({
143
- '@primary-color': initSetting.primaryColor
144
- }).then(function () {
145
- var styleDom = document.createElement('style');
146
- styleDom.innerHTML = '\n .xgui-nhTableNew .ant-table-tbody>tr:nth-of-type(2n){\n background: ' + initSetting.primaryColor + '0D;\n }';
147
- document.getElementsByTagName('body')[0].appendChild(styleDom);
148
- _this.setState({ layoutShow: true });
149
- }).catch(function () {
150
- _this.setState({ layoutShow: true });
151
- });
152
- } else {
153
- _this.setState({ layoutShow: true });
154
- }
155
- });
156
- } else {
157
- sessionStorage.setItem('setting', (0, _stringify2.default)(defaultSetting));
158
- _this.changeBaseFontSize(defaultSetting.fontSize);
159
- if (window.less && window.less.modifyVars) {
160
- window.less.modifyVars({
161
- '@primary-color': defaultSetting.primaryColor
162
- }).then(function () {
163
- var styleDom = document.createElement('style');
164
- styleDom.innerHTML = '\n .xgui-nhTableNew .ant-table-tbody>tr:nth-of-type(2n){\n background: ' + defaultSetting.primaryColor + '0D;\n }';
165
- document.getElementsByTagName('body')[0].appendChild(styleDom);
166
- _this.setState({
167
- setting: defaultSetting,
168
- prevSetting: (0, _stringify2.default)(defaultSetting),
169
- layoutShow: true
170
- });
171
- });
172
- } else {
173
- _this.setState({
174
- layoutShow: true
175
- });
176
- }
177
- }
178
- }).catch(function () {
179
- sessionStorage.setItem('setting', (0, _stringify2.default)(defaultSetting));
180
- _this.changeBaseFontSize(defaultSetting.fontSize);
181
- if (window.less && window.less.modifyVars) {
182
- window.less.modifyVars({
183
- '@primary-color': defaultSetting.primaryColor
184
- }).then(function () {
185
- var styleDom = document.createElement('style');
186
- styleDom.innerHTML = '\n .xgui-nhTableNew .ant-table-tbody>tr:nth-of-type(2n){\n background: ' + defaultSetting.primaryColor + '0D;\n }';
187
- document.getElementsByTagName('body')[0].appendChild(styleDom);
188
- _this.setState({
189
- setting: defaultSetting,
190
- prevSetting: (0, _stringify2.default)(defaultSetting),
191
- layoutShow: true
192
- });
193
- });
194
- } else {
195
- _this.setState({
196
- layoutShow: true
197
- });
198
- }
199
- });
200
- };
201
-
202
- _this.changeBaseFontSize = function (size) {
203
- var Dom = document.getElementsByTagName('html')[0];
204
- var baseNumberFontSize = 54;
205
- var _fontSize = undefined;
206
- switch (size) {
207
- case 'default':
208
- _fontSize = baseNumberFontSize + 'Px';
209
- break;
210
- case 'big':
211
- _fontSize = +baseNumberFontSize + 5 + 'Px';
212
- break;
213
- case 'huge':
214
- _fontSize = +baseNumberFontSize + 15 + 'Px';
215
- break;
122
+ (0, _inherits3.default)(NHLayout, _React$Component);
123
+
124
+ function NHLayout(props) {
125
+ (0, _classCallCheck3.default)(this, NHLayout);
126
+
127
+ var _this = (0, _possibleConstructorReturn3.default)(this, (NHLayout.__proto__ || (0, _getPrototypeOf2.default)(NHLayout)).call(this, props));
128
+
129
+ _this.getLayoutSetting = function () {
130
+ _this.setState({ layoutShow: false });
131
+ var baseUrl = window.xtglUrl || 'api/hq-xtgl';
132
+ (0, _NHFetch3.default)(baseUrl + '/openapi/getCsszByCsbz', 'GET', {
133
+ csbz: 'XTGL_LAYOUT_SETTING'
134
+ }).then(function (res) {
135
+ if (res && res.code === 200 && res.data) {
136
+ var initSetting = res.data.csz ? JSON.parse(res.data.csz) : defaultSetting;
137
+ sessionStorage.setItem('setting', (0, _stringify2.default)(initSetting));
138
+ _this.setState({
139
+ setting: initSetting,
140
+ csszxid: res.data.pkid ? res.data.pkid : '',
141
+ prevSetting: (0, _stringify2.default)(initSetting)
142
+ }, function () {
143
+ _this.changeBaseFontSize(initSetting.fontSize);
144
+ if (window.less && window.less.modifyVars) {
145
+ window.less.modifyVars({
146
+ '@primary-color': initSetting.primaryColor
147
+ }).then(function () {
148
+ var styleDom = document.createElement('style');
149
+ styleDom.innerHTML = '\n .xgui-nhTableNew .ant-table-tbody>tr:nth-of-type(2n){\n background: ' + initSetting.primaryColor + '0D;\n }';
150
+ document.getElementsByTagName('body')[0].appendChild(styleDom);
151
+ _this.setState({ layoutShow: true });
152
+ }).catch(function () {
153
+ _this.setState({ layoutShow: true });
154
+ });
155
+ } else {
156
+ _this.setState({ layoutShow: true });
216
157
  }
217
- Dom.style.fontSize = _fontSize;
218
- };
219
-
220
- _this.toggle = function () {
221
- _this.setState({
222
- collapsed: !_this.state.collapsed
158
+ });
159
+ } else {
160
+ sessionStorage.setItem('setting', (0, _stringify2.default)(defaultSetting));
161
+ _this.changeBaseFontSize(defaultSetting.fontSize);
162
+ if (window.less && window.less.modifyVars) {
163
+ window.less.modifyVars({
164
+ '@primary-color': defaultSetting.primaryColor
165
+ }).then(function () {
166
+ var styleDom = document.createElement('style');
167
+ styleDom.innerHTML = '\n .xgui-nhTableNew .ant-table-tbody>tr:nth-of-type(2n){\n background: ' + defaultSetting.primaryColor + '0D;\n }';
168
+ document.getElementsByTagName('body')[0].appendChild(styleDom);
169
+ _this.setState({
170
+ setting: defaultSetting,
171
+ prevSetting: (0, _stringify2.default)(defaultSetting),
172
+ layoutShow: true
173
+ });
223
174
  });
224
- };
225
-
226
- _this.changeSetting = function (key, value) {
227
- var setting = _this.state.setting;
228
-
229
- var nextState = (0, _extends3.default)({}, setting);
230
- nextState[key] = value;
231
- if (key === "layout") {
232
- // nextState.contentWidth = value === "topmenu" ? "Fluid" : "Fixed";
233
- nextState.contentWidth = 'Fluid';
234
- } else if (key === "fixedHeader" && !value) {
235
- nextState.autoHideHeader = false;
236
- }
237
-
238
- _this.setState({ setting: nextState });
239
- _this.setSettingToSession(nextState);
240
- };
241
-
242
- _this.setSetting = function (setting) {
243
- _this.setState({ setting: setting });
244
- _this.setSettingToSession(setting);
245
- };
246
-
247
- _this.setSettingToSession = function (setting) {
248
- sessionStorage.setItem('setting', (0, _stringify2.default)(setting));
249
- };
250
-
251
- _this.saveSettingToDataBase = function () {
252
- var _this$state = _this.state,
253
- csszxid = _this$state.csszxid,
254
- setting = _this$state.setting;
255
-
256
- if (!csszxid) {
257
- _message3.default.error('参数设置中未配置XTGL_LAYOUT_SETTING，请联系管理员处理!');
258
- return;
259
- }
260
- var prams = [{ csszxid: csszxid, csz: (0, _stringify2.default)(setting) }];
261
- (0, _NHFetch3.default)('api/zhxg-xtgl/parameterSetting/updateMulti', 'POST', prams).then(function (res) {
262
- if (res && res.code === 200) {
263
- _message3.default.success('Layout配置项保存成功！');
264
- }
175
+ } else {
176
+ _this.setState({
177
+ layoutShow: true
265
178
  });
266
- };
267
-
268
- _this.handScroll = function () {
269
- var autoHideHeader = _this.state.setting.autoHideHeader;
270
- var visible = _this.state.visible;
271
-
272
- if (!autoHideHeader) {
273
- return;
274
- }
275
- var scrollTop = document.body.scrollTop + document.documentElement.scrollTop;
276
- if (!_this.ticking) {
277
- _this.ticking = true;
278
- requestAnimationFrame(function () {
279
- if (_this.oldScrollTop > scrollTop) {
280
- _this.setState({
281
- visible: true
282
- });
283
- } else if (scrollTop > 300 && visible) {
284
- _this.setState({
285
- visible: false
286
- });
287
- } else if (scrollTop < 300 && !visible) {
288
- _this.setState({
289
- visible: true
290
- });
291
- }
292
- _this.oldScrollTop = scrollTop;
293
- _this.ticking = false;
294
- });
295
- }
296
- };
297
-
298
- _this.state = {
299
- collapsed: false, //是否关闭菜单
300
- fwmc: _this.props.config.fwmc, //服务名称
301
- visible: true, //是否显示header
302
- setting: sessionStorage.getItem('setting') ? JSON.parse(sessionStorage.getItem('setting')) : defaultSetting, // 配置
303
- layoutShow: false, //展示layout
304
- prevSetting: '', //数据库存储的配置可用于重置
305
- csszxid: '', //layout设置项的pkid
306
- hover: false //鼠标hover
307
- };
308
- return _this;
309
- }
310
-
311
- (0, _createClass3.default)(NHLayout, [{
312
- key: 'UNSAFE_componentWillMount',
313
- value: function UNSAFE_componentWillMount() {
314
- var _this2 = this;
315
-
316
- var config = this.props.config;
317
-
318
- var fwmcUrl = config.fwmcUrl,
319
- fwmc = config.fwmc;
320
- //动态获取服务名称(优选使用fwmcUrl，如果未指定fwmcUrl则以fwmc为准)
321
- if (fwmcUrl && fwmcUrl.startsWith("api/")) {
322
- (0, _NHFetch3.default)(fwmcUrl, "GET").then(function (res) {
323
- if (res && res.data) {
324
- _this2.setState({
325
- fwmc: res.data
326
- });
327
- } else {
328
- _this2.setState({
329
- fwmc: fwmc
330
- });
331
- }
332
- });
333
- } else if (fwmc) {
334
- this.setState({
335
- fwmc: fwmc
336
- });
337
- }
179
+ }
338
180
  }
339
- }, {
340
- key: 'componentDidMount',
341
- value: function componentDidMount() {
342
- document.addEventListener("scroll", this.handScroll, { passive: true });
343
- this.getLayoutSetting();
181
+ }).catch(function () {
182
+ sessionStorage.setItem('setting', (0, _stringify2.default)(defaultSetting));
183
+ _this.changeBaseFontSize(defaultSetting.fontSize);
184
+ if (window.less && window.less.modifyVars) {
185
+ window.less.modifyVars({
186
+ '@primary-color': defaultSetting.primaryColor
187
+ }).then(function () {
188
+ var styleDom = document.createElement('style');
189
+ styleDom.innerHTML = '\n .xgui-nhTableNew .ant-table-tbody>tr:nth-of-type(2n){\n background: ' + defaultSetting.primaryColor + '0D;\n }';
190
+ document.getElementsByTagName('body')[0].appendChild(styleDom);
191
+ _this.setState({
192
+ setting: defaultSetting,
193
+ prevSetting: (0, _stringify2.default)(defaultSetting),
194
+ layoutShow: true
195
+ });
196
+ });
197
+ } else {
198
+ _this.setState({
199
+ layoutShow: true
200
+ });
344
201
  }
345
- }, {
346
- key: 'componentWillUnmount',
347
- value: function componentWillUnmount() {
348
- document.removeEventListener("scroll", this.handScroll);
202
+ });
203
+ };
204
+
205
+ _this.changeBaseFontSize = function (size) {
206
+ var Dom = document.getElementsByTagName('html')[0];
207
+ var baseNumberFontSize = 75;
208
+ var _fontSize = undefined;
209
+ switch (size) {
210
+ case 'default':
211
+ _fontSize = baseNumberFontSize + 'Px';
212
+ break;
213
+ case 'big':
214
+ _fontSize = +baseNumberFontSize + 5 + 'Px';
215
+ break;
216
+ case 'huge':
217
+ _fontSize = +baseNumberFontSize + 15 + 'Px';
218
+ break;
219
+ }
220
+ Dom.style.fontSize = _fontSize;
221
+ };
222
+
223
+ _this.toggle = function () {
224
+ _this.setState({
225
+ collapsed: !_this.state.collapsed
226
+ });
227
+ };
228
+
229
+ _this.changeSetting = function (key, value) {
230
+ var setting = _this.state.setting;
231
+
232
+ var nextState = (0, _extends3.default)({}, setting);
233
+ nextState[key] = value;
234
+ if (key === 'layout') {
235
+ // nextState.contentWidth = value === "topmenu" ? "Fluid" : "Fixed";
236
+ nextState.contentWidth = 'Fluid';
237
+ } else if (key === 'fixedHeader' && !value) {
238
+ nextState.autoHideHeader = false;
239
+ }
240
+
241
+ _this.setState({ setting: nextState });
242
+ _this.setSettingToSession(nextState);
243
+ };
244
+
245
+ _this.setSetting = function (setting) {
246
+ _this.setState({ setting: setting });
247
+ _this.setSettingToSession(setting);
248
+ };
249
+
250
+ _this.setSettingToSession = function (setting) {
251
+ sessionStorage.setItem('setting', (0, _stringify2.default)(setting));
252
+ };
253
+
254
+ _this.saveSettingToDataBase = function () {
255
+ var _this$state = _this.state,
256
+ csszxid = _this$state.csszxid,
257
+ setting = _this$state.setting;
258
+
259
+ if (!csszxid) {
260
+ _message3.default.error('参数设置中未配置XTGL_LAYOUT_SETTING，请联系管理员处理!');
261
+ return;
262
+ }
263
+ var prams = [{ csszxid: csszxid, csz: (0, _stringify2.default)(setting) }];
264
+ (0, _NHFetch3.default)('api/zhxg-xtgl/parameterSetting/updateMulti', 'POST', prams).then(function (res) {
265
+ if (res && res.code === 200) {
266
+ _message3.default.success('Layout配置项保存成功！');
349
267
  }
268
+ });
269
+ };
270
+
271
+ _this.handScroll = function () {
272
+ var autoHideHeader = _this.state.setting.autoHideHeader;
273
+ var visible = _this.state.visible;
274
+
275
+ if (!autoHideHeader) {
276
+ return;
277
+ }
278
+ var scrollTop = document.body.scrollTop + document.documentElement.scrollTop;
279
+ if (!_this.ticking) {
280
+ _this.ticking = true;
281
+ requestAnimationFrame(function () {
282
+ if (_this.oldScrollTop > scrollTop) {
283
+ _this.setState({
284
+ visible: true
285
+ });
286
+ } else if (scrollTop > 300 && visible) {
287
+ _this.setState({
288
+ visible: false
289
+ });
290
+ } else if (scrollTop < 300 && !visible) {
291
+ _this.setState({
292
+ visible: true
293
+ });
294
+ }
295
+ _this.oldScrollTop = scrollTop;
296
+ _this.ticking = false;
297
+ });
298
+ }
299
+ };
300
+
301
+ _this.state = {
302
+ collapsed: false, //是否关闭菜单
303
+ fwmc: _this.props.config.fwmc, //服务名称
304
+ visible: true, //是否显示header
305
+ setting: sessionStorage.getItem('setting') ? JSON.parse(sessionStorage.getItem('setting')) : defaultSetting, // 配置
306
+ layoutShow: false, //展示layout
307
+ prevSetting: '', //数据库存储的配置可用于重置
308
+ csszxid: '', //layout设置项的pkid
309
+ hover: false //鼠标hover
310
+ };
311
+ return _this;
312
+ }
313
+
314
+ (0, _createClass3.default)(NHLayout, [{
315
+ key: 'UNSAFE_componentWillMount',
316
+ value: function UNSAFE_componentWillMount() {
317
+ var _this2 = this;
318
+
319
+ var config = this.props.config;
320
+
321
+ var fwmcUrl = config.fwmcUrl,
322
+ fwmc = config.fwmc;
323
+ //动态获取服务名称(优选使用fwmcUrl，如果未指定fwmcUrl则以fwmc为准)
324
+ if (fwmcUrl && fwmcUrl.startsWith('api/')) {
325
+ (0, _NHFetch3.default)(fwmcUrl, 'GET').then(function (res) {
326
+ if (res && res.data) {
327
+ _this2.setState({
328
+ fwmc: res.data
329
+ });
330
+ } else {
331
+ _this2.setState({
332
+ fwmc: fwmc
333
+ });
334
+ }
335
+ });
336
+ } else if (fwmc) {
337
+ this.setState({
338
+ fwmc: fwmc
339
+ });
340
+ }
341
+ }
342
+ }, {
343
+ key: 'componentDidMount',
344
+ value: function componentDidMount() {
345
+ document.addEventListener('scroll', this.handScroll, { passive: true });
346
+ this.getLayoutSetting();
347
+ }
348
+ }, {
349
+ key: 'componentWillUnmount',
350
+ value: function componentWillUnmount() {
351
+ document.removeEventListener('scroll', this.handScroll);
352
+ }
350
353
 
351
- /**
352
- * 获取系统管理 配置项中的XTGL_LAYOUT_SETTING配置参数，如果为空的话就取默认的defaultSetting
353
- */
354
-
355
-
356
- /** 改变全局的fontsize */
357
-
358
- /** 更改学工UI风格配置 */
359
-
360
- /** 将setting缓存到session中 */
361
-
362
- /** 将setting保存到数据库中 */
363
-
364
- }, {
365
- key: 'render',
366
- value: function render() {
367
- var _this3 = this;
368
-
369
- var curUrl = window.location.href.split('#')[1];
370
- var menuIcons = this.props.menuIcons;
371
- var _state = this.state,
372
- setting = _state.setting,
373
- visible = _state.visible,
374
- layoutShow = _state.layoutShow,
375
- hover = _state.hover;
376
- var title = setting.title,
377
- navTheme = setting.navTheme,
378
- layout = setting.layout,
379
- contentWidth = setting.contentWidth,
380
- fixedHeader = setting.fixedHeader,
381
- fixSiderbar = setting.fixSiderbar,
382
- autoHideHeader = setting.autoHideHeader;
383
- // const layout === 'topmenu' = layout === 'topmenu'; //显示顶部菜单
384
- // 若内容区域宽度为定宽 则设置为1200px 左右居中
385
-
386
- var contentProps = contentWidth === 'Fixed' ? { margin: '0 auto', width: '1200px' } : {};
387
- var siderCom = _react2.default.createElement(
388
- Sider,
389
- {
390
- trigger: null,
391
- collapsible: true,
392
- collapsed: this.state.collapsed,
393
- width: leftMenuWidth,
394
- theme: navTheme,
395
- className: layout === 'mixmenu' && fixedHeader ? 'xgui-layout-fixHeader-content xgui-layout-sider' : 'xgui-layout-sider',
396
- onMouseEnter: function onMouseEnter() {
397
- _this3.setState({ hover: true });
398
- },
399
- onMouseLeave: function onMouseLeave() {
400
- _this3.setState({ hover: false });
401
- }
402
- },
403
- layout === 'sidemenu' && _react2.default.createElement(
404
- 'div',
405
- { className: 'xgui-layout-logo' },
406
- _react2.default.createElement('img', { alt: '', style: { maxWidth: 40, maxHeight: 40 }, src: this.props.config.logoUrl,
407
- onError: function onError(e) {
408
- e.target.src = _this3.props.config.logo;
409
- } }),
410
- !this.state.collapsed && _react2.default.createElement(
411
- 'span',
412
- { className: (0, _classnames2.default)('xgui-layout-logoSpan', { 'light': navTheme === 'light' }) },
413
- _react2.default.createElement(
414
- 'b',
415
- null,
416
- this.state.fwmc
417
- )
418
- )
419
- ),
420
- _react2.default.createElement(_LeftMenu2.default, { curUrl: curUrl, menuIcons: menuIcons, collapsed: this.state.collapsed, config: this.props.config, allMenu: this.props.allMenu, setting: setting }),
421
- _react2.default.createElement(
422
- 'div',
423
- { onClick: this.toggle, style: hover ? {} : { visibility: 'hidden' }, className: 'xgui-sider-btn-fixed' },
424
- _react2.default.createElement(_icon2.default, { type: 'left', rotate: this.state.collapsed ? 180 : 0 })
425
- ),
426
- !this.state.collapsed && this.props.config.sysVersion ? _react2.default.createElement(
427
- 'div',
428
- { className: 'xgui-layout-menu-version' },
429
- '\u7248\u672C\u53F7\uFF1A',
430
- this.props.config.sysVersion ? this.props.config.sysVersion : ''
431
- ) : null
432
- );
433
- var conTentCom = _react2.default.createElement(
434
- _layout2.default,
435
- { hasSider: false },
436
- layout !== 'mixmenu' && visible ? _react2.default.createElement(_Top2.default, { collapsed: this.state.collapsed, toggle: this.toggle, config: this.props.config, menuIcons: menuIcons,
437
- updataPassBtnAuth: this.props.config.updataPassBtnAuth, setting: setting }) : null,
438
- _react2.default.createElement(
439
- Content,
440
- { style: (0, _extends3.default)({ height: layout !== 'mixmenu' ? (0, _getSize3.default)().contentH : (0, _getSize3.default)().contentH + 40 }, contentProps), className: fixedHeader ? 'xgui-layout-fixHeader-content' : '' },
441
- layout === 'mixmenu' && _react2.default.createElement(_index2.default, { layout: layout }),
442
- this.props.children
443
- )
444
- );
445
- if (!layoutShow) {
446
- // return null;
447
- return _react2.default.createElement(
448
- _spin2.default,
449
- { spinning: true, size: 'large' },
450
- _react2.default.createElement('div', { style: { width: (0, _getSize3.default)().windowW, height: (0, _getSize3.default)().windowH } })
451
- );
354
+ /**
355
+ * 获取系统管理 配置项中的XTGL_LAYOUT_SETTING配置参数，如果为空的话就取默认的defaultSetting
356
+ */
357
+
358
+
359
+ /** 改变全局的fontsize */
360
+
361
+ /** 更改学工UI风格配置 */
362
+
363
+ /** 将setting缓存到session中 */
364
+
365
+ /** 将setting保存到数据库中 */
366
+
367
+ }, {
368
+ key: 'render',
369
+ value: function render() {
370
+ var _this3 = this;
371
+
372
+ var curUrl = window.location.href.split('#')[1];
373
+ var menuIcons = this.props.menuIcons;
374
+ var _state = this.state,
375
+ setting = _state.setting,
376
+ visible = _state.visible,
377
+ layoutShow = _state.layoutShow,
378
+ hover = _state.hover;
379
+ var title = setting.title,
380
+ navTheme = setting.navTheme,
381
+ layout = setting.layout,
382
+ contentWidth = setting.contentWidth,
383
+ fixedHeader = setting.fixedHeader,
384
+ fixSiderbar = setting.fixSiderbar,
385
+ autoHideHeader = setting.autoHideHeader;
386
+ // const layout === 'topmenu' = layout === 'topmenu'; //显示顶部菜单
387
+ // 若内容区域宽度为定宽 则设置为1200px 左右居中
388
+
389
+ var contentProps = contentWidth === 'Fixed' ? { margin: '0 auto', width: '1200px' } : {};
390
+ var siderCom = _react2.default.createElement(
391
+ Sider,
392
+ {
393
+ trigger: null,
394
+ collapsible: true,
395
+ collapsed: this.state.collapsed,
396
+ width: leftMenuWidth,
397
+ theme: navTheme,
398
+ className: layout === 'mixmenu' && fixedHeader ? 'xgui-layout-fixHeader-content xgui-layout-sider' : 'xgui-layout-sider',
399
+ onMouseEnter: function onMouseEnter() {
400
+ _this3.setState({ hover: true });
401
+ },
402
+ onMouseLeave: function onMouseLeave() {
403
+ _this3.setState({ hover: false });
404
+ }
405
+ },
406
+ layout === 'sidemenu' && _react2.default.createElement(
407
+ 'div',
408
+ { className: 'xgui-layout-logo' },
409
+ _react2.default.createElement('img', {
410
+ alt: '',
411
+ style: { maxWidth: 40, maxHeight: 40 },
412
+ src: this.props.config.logoUrl,
413
+ onError: function onError(e) {
414
+ e.target.src = _this3.props.config.logo;
452
415
  }
453
- return _react2.default.createElement(
454
- 'div',
455
- { style: { width: '100%', height: '100%' } },
456
- _react2.default.createElement(
457
- _layout2.default,
458
- { style: { height: '100%' } },
459
- layout === 'mixmenu' && visible && _react2.default.createElement(_mixTop2.default, { collapsed: this.state.collapsed, toggle: this.toggle, config: this.props.config,
460
- updataPassBtnAuth: this.props.config.updataPassBtnAuth, setting: setting }),
461
-
462
- // layout !== 'topmenu'&&
463
- // <Sider
464
- // trigger={null}
465
- // collapsible
466
- // collapsed={this.state.collapsed}
467
- // width={200}
468
- // theme={navTheme}
469
- // >
470
- // <div className={'xgui-layout-logo'}>
471
- // <img alt='' style={{maxWidth: 40, maxHeight: 40}} src={this.props.config.logoUrl}
472
- // onError={(e) => {
473
- // e.target.src = this.props.config.logo;
474
- // }}/>
475
- // {!this.state.collapsed &&
476
- // <span className={classNames('xgui-layout-logoSpan',{'light':navTheme==='light'})}><b>{this.state.fwmc}</b></span>}
477
- // </div>
478
- // <LeftMenu curUrl={curUrl} menuIcons={this.props.menuIcons} collapsed={ this.state.collapsed } config={this.props.config} allMenu={this.props.allMenu} setting={setting}/>
479
- // {/* 显示在左侧菜单底部的版本号 */}
480
- // {
481
- // !this.state.collapsed && this.props.config.sysVersion?
482
- // <div className={'xgui-layout-menu-version'}>
483
- // 版本号：{this.props.config.sysVersion?this.props.config.sysVersion:''}
484
- // </div>
485
- // : null
486
- // }
487
- // </Sider>
488
-
489
- layout === 'mixmenu' ?
490
- // 混合菜单布局
491
- _react2.default.createElement(
492
- _layout2.default,
493
- { hasSider: true },
494
- siderCom,
495
- conTentCom
496
- ) :
497
- // 顶部菜单布局
498
- layout === 'topmenu' ? _react2.default.createElement(
499
- _react2.default.Fragment,
500
- null,
501
- conTentCom
502
- ) :
503
- // 侧边菜单布局
504
- _react2.default.createElement(
505
- _layout2.default,
506
- { hasSider: true },
507
- siderCom,
508
- conTentCom
509
- )
510
- ),
511
-
512
- // 只有系统管理服务内容可开启主题设置
513
- this.props.config.baseUrl === 'api/zhxg-xtgl' && _react2.default.createElement(_settingDrawer2.default, { setting: setting, changeSetting: this.changeSetting, onSaveTheme: this.saveSettingToDataBase })
514
- );
515
- }
516
- }]);
517
- return NHLayout;
416
+ }),
417
+ !this.state.collapsed && _react2.default.createElement(
418
+ 'span',
419
+ {
420
+ className: (0, _classnames2.default)('xgui-layout-logoSpan', {
421
+ light: navTheme === 'light'
422
+ })
423
+ },
424
+ _react2.default.createElement(
425
+ 'b',
426
+ null,
427
+ this.state.fwmc
428
+ )
429
+ )
430
+ ),
431
+ _react2.default.createElement(_LeftMenu2.default, {
432
+ curUrl: curUrl,
433
+ menuIcons: menuIcons,
434
+ collapsed: this.state.collapsed,
435
+ config: this.props.config,
436
+ allMenu: this.props.allMenu,
437
+ setting: setting
438
+ }),
439
+ _react2.default.createElement(
440
+ 'div',
441
+ {
442
+ onClick: this.toggle,
443
+ style: hover ? {} : { visibility: 'hidden' },
444
+ className: 'xgui-sider-btn-fixed'
445
+ },
446
+ _react2.default.createElement(_icon2.default, { type: 'left', rotate: this.state.collapsed ? 180 : 0 })
447
+ ),
448
+ !this.state.collapsed && this.props.config.sysVersion ? _react2.default.createElement(
449
+ 'div',
450
+ { className: 'xgui-layout-menu-version' },
451
+ '\u7248\u672C\u53F7\uFF1A',
452
+ this.props.config.sysVersion ? this.props.config.sysVersion : ''
453
+ ) : null
454
+ );
455
+ var conTentCom = _react2.default.createElement(
456
+ _layout2.default,
457
+ { hasSider: false },
458
+ layout !== 'mixmenu' && visible ? _react2.default.createElement(_Top2.default, {
459
+ collapsed: this.state.collapsed,
460
+ toggle: this.toggle,
461
+ config: this.props.config,
462
+ menuIcons: menuIcons,
463
+ updataPassBtnAuth: this.props.config.updataPassBtnAuth,
464
+ setting: setting
465
+ }) : null,
466
+ _react2.default.createElement(
467
+ Content,
468
+ {
469
+ style: (0, _extends3.default)({
470
+ height: layout !== 'mixmenu' ? (0, _getSize3.default)().contentH : (0, _getSize3.default)().contentH + 40
471
+ }, contentProps),
472
+ className: fixedHeader ? 'xgui-layout-fixHeader-content' : ''
473
+ },
474
+ layout === 'mixmenu' && _react2.default.createElement(_index2.default, { layout: layout }),
475
+ this.props.children
476
+ )
477
+ );
478
+ if (!layoutShow) {
479
+ // return null;
480
+ return _react2.default.createElement(
481
+ _spin2.default,
482
+ { spinning: true, size: 'large' },
483
+ _react2.default.createElement('div', {
484
+ style: { width: (0, _getSize3.default)().windowW, height: (0, _getSize3.default)().windowH }
485
+ })
486
+ );
487
+ }
488
+ return _react2.default.createElement(
489
+ 'div',
490
+ { style: { width: '100%', height: '100%' } },
491
+ _react2.default.createElement(
492
+ _layout2.default,
493
+ { style: { height: '100%' } },
494
+ layout === 'mixmenu' && visible && _react2.default.createElement(_mixTop2.default, {
495
+ collapsed: this.state.collapsed,
496
+ toggle: this.toggle,
497
+ config: this.props.config,
498
+ updataPassBtnAuth: this.props.config.updataPassBtnAuth,
499
+ setting: setting
500
+ }),
501
+
502
+ // layout !== 'topmenu'&&
503
+ // <Sider
504
+ // trigger={null}
505
+ // collapsible
506
+ // collapsed={this.state.collapsed}
507
+ // width={200}
508
+ // theme={navTheme}
509
+ // >
510
+ // <div className={'xgui-layout-logo'}>
511
+ // <img alt='' style={{maxWidth: 40, maxHeight: 40}} src={this.props.config.logoUrl}
512
+ // onError={(e) => {
513
+ // e.target.src = this.props.config.logo;
514
+ // }}/>
515
+ // {!this.state.collapsed &&
516
+ // <span className={classNames('xgui-layout-logoSpan',{'light':navTheme==='light'})}><b>{this.state.fwmc}</b></span>}
517
+ // </div>
518
+ // <LeftMenu curUrl={curUrl} menuIcons={this.props.menuIcons} collapsed={ this.state.collapsed } config={this.props.config} allMenu={this.props.allMenu} setting={setting}/>
519
+ // {/* 显示在左侧菜单底部的版本号 */}
520
+ // {
521
+ // !this.state.collapsed && this.props.config.sysVersion?
522
+ // <div className={'xgui-layout-menu-version'}>
523
+ // 版本号：{this.props.config.sysVersion?this.props.config.sysVersion:''}
524
+ // </div>
525
+ // : null
526
+ // }
527
+ // </Sider>
528
+
529
+ layout === 'mixmenu' ?
530
+ // 混合菜单布局
531
+ _react2.default.createElement(
532
+ _layout2.default,
533
+ { hasSider: true },
534
+ siderCom,
535
+ conTentCom
536
+ ) : // 顶部菜单布局
537
+ layout === 'topmenu' ? _react2.default.createElement(
538
+ _react2.default.Fragment,
539
+ null,
540
+ conTentCom
541
+ ) :
542
+ // 侧边菜单布局
543
+ _react2.default.createElement(
544
+ _layout2.default,
545
+ { hasSider: true },
546
+ siderCom,
547
+ conTentCom
548
+ )
549
+ ),
550
+
551
+ // 只有系统管理服务内容可开启主题设置
552
+ this.props.config.baseUrl === 'api/zhxg-xtgl' && _react2.default.createElement(_settingDrawer2.default, {
553
+ setting: setting,
554
+ changeSetting: this.changeSetting,
555
+ onSaveTheme: this.saveSettingToDataBase
556
+ })
557
+ );
558
+ }
559
+ }]);
560
+ return NHLayout;
518
561
  }(_react2.default.Component);
519
562
 
520
563
  exports.default = NHLayout;
package/lib/layouts/settingDrawer/fontChange.js CHANGED
@@ -1,7 +1,7 @@
1
1
  'use strict';
2
2
 
3
3
  Object.defineProperty(exports, "__esModule", {
4
- value: true
4
+ value: true
5
5
  });
6
6
 
7
7
  var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
@@ -23,89 +23,101 @@ require('../../../assets/layouts/settingDrawer/style.less');
23
23
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
24
24
 
25
25
  function FontChange(props) {
26
- var _props$initFontSize = props.initFontSize,
27
- initFontSize = _props$initFontSize === undefined ? 'default' : _props$initFontSize,
28
- updateFontSize = props.updateFontSize; //字号 default/big/huge
26
+ var _props$initFontSize = props.initFontSize,
27
+ initFontSize = _props$initFontSize === undefined ? 'default' : _props$initFontSize,
28
+ updateFontSize = props.updateFontSize; //字号 default/big/huge
29
29
 
30
- var _useState = (0, _react.useState)(initFontSize),
31
- _useState2 = (0, _slicedToArray3.default)(_useState, 2),
32
- fontSize = _useState2[0],
33
- setFontSize = _useState2[1];
30
+ var _useState = (0, _react.useState)(initFontSize),
31
+ _useState2 = (0, _slicedToArray3.default)(_useState, 2),
32
+ fontSize = _useState2[0],
33
+ setFontSize = _useState2[1];
34
34
 
35
- var Dom = document.getElementsByTagName('html')[0];
36
- var changeFontSize = function changeFontSize(size) {
37
- var baseNumberFontSize = 54; //默认号54
38
- switch (size) {
39
- case 'default':
40
- Dom.style.fontSize = baseNumberFontSize + 'Px';
41
- setFontSize(size);
42
- updateFontSize(size);
43
- break;
44
- case 'big':
45
- Dom.style.fontSize = +baseNumberFontSize + 5 + 'Px';
46
- setFontSize(size);
47
- updateFontSize(size);
48
- break;
49
- case 'huge':
50
- Dom.style.fontSize = +baseNumberFontSize + 15 + 'Px';
51
- setFontSize(size);
52
- updateFontSize(size);
53
- break;
54
- }
55
- };
56
- return _react2.default.createElement(
35
+ var Dom = document.getElementsByTagName('html')[0];
36
+ var changeFontSize = function changeFontSize(size) {
37
+ var baseNumberFontSize = 75; //默认号75
38
+ switch (size) {
39
+ case 'default':
40
+ Dom.style.fontSize = baseNumberFontSize + 'Px';
41
+ setFontSize(size);
42
+ updateFontSize(size);
43
+ break;
44
+ case 'big':
45
+ Dom.style.fontSize = +baseNumberFontSize + 5 + 'Px';
46
+ setFontSize(size);
47
+ updateFontSize(size);
48
+ break;
49
+ case 'huge':
50
+ Dom.style.fontSize = +baseNumberFontSize + 15 + 'Px';
51
+ setFontSize(size);
52
+ updateFontSize(size);
53
+ break;
54
+ }
55
+ };
56
+ return _react2.default.createElement(
57
+ 'div',
58
+ null,
59
+ _react2.default.createElement(
60
+ 'div',
61
+ { className: 'fontContent' },
62
+ _react2.default.createElement(
57
63
  'div',
58
64
  null,
59
65
  _react2.default.createElement(
60
- 'div',
61
- { className: 'fontContent' },
62
- _react2.default.createElement(
63
- 'div',
64
- null,
65
- _react2.default.createElement(
66
- 'div',
67
- { className: (0, _classnames2.default)('fontContentBox', { 'selected': fontSize == 'default' }),
68
- onClick: function onClick() {
69
- changeFontSize('default');
70
- } },
71
- _react2.default.createElement(
72
- 'p',
73
- null,
74
- '\u6807\u51C6'
75
- )
76
- ),
77
- _react2.default.createElement(
78
- 'p',
79
- { className: 'hint' },
80
- '\u63A8\u8350'
81
- )
82
- ),
83
- _react2.default.createElement(
84
- 'div',
85
- { className: (0, _classnames2.default)('fontContentBox', { 'selected': fontSize == 'big' }),
86
- onClick: function onClick() {
87
- changeFontSize('big');
88
- } },
89
- _react2.default.createElement(
90
- 'p',
91
- null,
92
- '\u5927\u53F7'
93
- )
94
- ),
95
- _react2.default.createElement(
96
- 'div',
97
- { className: (0, _classnames2.default)('fontContentBox', { 'selected': fontSize == 'huge' }),
98
- onClick: function onClick() {
99
- changeFontSize('huge');
100
- } },
101
- _react2.default.createElement(
102
- 'p',
103
- null,
104
- '\u52A0\u5927'
105
- )
106
- )
66
+ 'div',
67
+ {
68
+ className: (0, _classnames2.default)('fontContentBox', {
69
+ selected: fontSize == 'default'
70
+ }),
71
+ onClick: function onClick() {
72
+ changeFontSize('default');
73
+ }
74
+ },
75
+ _react2.default.createElement(
76
+ 'p',
77
+ null,
78
+ '\u6807\u51C6'
79
+ )
80
+ ),
81
+ _react2.default.createElement(
82
+ 'p',
83
+ { className: 'hint' },
84
+ '\u63A8\u8350'
85
+ )
86
+ ),
87
+ _react2.default.createElement(
88
+ 'div',
89
+ {
90
+ className: (0, _classnames2.default)('fontContentBox', {
91
+ selected: fontSize == 'big'
92
+ }),
93
+ onClick: function onClick() {
94
+ changeFontSize('big');
95
+ }
96
+ },
97
+ _react2.default.createElement(
98
+ 'p',
99
+ null,
100
+ '\u5927\u53F7'
101
+ )
102
+ ),
103
+ _react2.default.createElement(
104
+ 'div',
105
+ {
106
+ className: (0, _classnames2.default)('fontContentBox', {
107
+ selected: fontSize == 'huge'
108
+ }),
109
+ onClick: function onClick() {
110
+ changeFontSize('huge');
111
+ }
112
+ },
113
+ _react2.default.createElement(
114
+ 'p',
115
+ null,
116
+ '\u52A0\u5927'
107
117
  )
108
- );
118
+ )
119
+ )
120
+ );
109
121
  } /*
110
122
  * @Description: 字号切换
111
123
  * @Author: lisenlin
package/lib/utils/index.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.randomNumEnum = exports.getStyle = exports.getValueFromArray = exports.getLabelValueTree = exports.createUuid = exports.createScript = exports.getBase64 = exports.compatibleAnimationFrame = exports.cutArray = exports.arrayMove = exports.arrayMoveMutate = exports.checkPassword = exports.matchParamsPath = exports.urlToList = exports.getHashParam = exports.isUrl = exports.getRouterAuthority = exports.transformDate = exports.getStrLength = exports.DateUtil = exports._utf8_encode = exports.encode = exports.decode = exports.getSize = exports.getOffset = undefined;
6
+ exports.isWeiXn = exports.isIOS = exports.isAndroid = exports.isMobile = exports.randomNumEnum = exports.getStyle = exports.getValueFromArray = exports.getLabelValueTree = exports.createUuid = exports.createScript = exports.getBase64 = exports.compatibleAnimationFrame = exports.cutArray = exports.arrayMove = exports.arrayMoveMutate = exports.checkPassword = exports.matchParamsPath = exports.urlToList = exports.getHashParam = exports.isUrl = exports.getRouterAuthority = exports.transformDate = exports.getStrLength = exports.DateUtil = exports._utf8_encode = exports.encode = exports.decode = exports.getSize = exports.getOffset = undefined;
7
7
 
8
8
  var _stringify = require('babel-runtime/core-js/json/stringify');
9
9
 
@@ -68,7 +68,7 @@ var getOffset = exports.getOffset = function getOffset(ele) {
68
68
  * @Author: admin
69
69
  * @Date: 2020-03-06 09:45:52
70
70
  * @LastEditors: jiangzhongxin
71
- * @LastEditTime: 2023-09-28 15:44:43
71
+ * @LastEditTime: 2023-10-17 09:46:26
72
72
  */
73
73
  var getSize = exports.getSize = function getSize() {
74
74
  var windowW = void 0,
@@ -212,14 +212,13 @@ var DateUtil = exports.DateUtil = {
212
212
  var second = now.getSeconds() >= 10 ? now.getSeconds() : '0' + now.getSeconds();
213
213
  return year + '-' + month + '-' + date + ' ' + hour + ':' + minute + ':' + second;
214
214
  }
215
- };
216
215
 
217
- /**
218
- * GBK字符集实际长度计算
219
- * @param {*} str
220
- * @returns
221
- */
222
- var getStrLength = exports.getStrLength = function getStrLength(str) {
216
+ /**
217
+ * GBK字符集实际长度计算
218
+ * @param {*} str
219
+ * @returns
220
+ */
221
+ };var getStrLength = exports.getStrLength = function getStrLength(str) {
223
222
  var realLength = 0;
224
223
  var len = str.length;
225
224
  var charCode = -1;
@@ -490,6 +489,9 @@ var createScript = exports.createScript = function createScript() {
490
489
  * @returns
491
490
  */
492
491
  var createUuid = exports.createUuid = function createUuid() {
492
+ var len = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 32;
493
+ var radix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 16;
494
+
493
495
  var chars = '0123456789abcdefghijklmnopqrstuvwxyz'.split('');
494
496
  var uuid = [],
495
497
  i;
@@ -801,4 +803,37 @@ var randomNumEnum = exports.randomNumEnum = function randomNumEnum(array, num) {
801
803
  shuffled[i] = temp;
802
804
  }
803
805
  return shuffled.slice(min);
806
+ };
807
+
808
+ /*******
809
+ * @description: 检测移动端-PC端
810
+ * @author: 琴时
811
+ * @param {*} [无]
812
+ * @return {*} [移动端:true - PC端:false]
813
+ */
814
+ var ua = navigator.userAgent; // 获取设备信息
815
+ var isMobile = exports.isMobile = function isMobile() {
816
+ return Boolean(ua.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i));
817
+ };
818
+
819
+ /*******
820
+ * @description: android终端-ios终端
821
+ * @author: 琴时
822
+ * @return {Boolean}
823
+ */
824
+ var isAndroid = exports.isAndroid = function isAndroid() {
825
+ return ua.indexOf('Android') > -1 || ua.indexOf('Adr') > -1;
826
+ };
827
+
828
+ var isIOS = exports.isIOS = function isIOS() {
829
+ return Boolean(ua.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/));
830
+ };
831
+
832
+ /*******
833
+ * @description: 是否微信环境
834
+ * @author: 琴时
835
+ * @return {Boolean}
836
+ */
837
+ var isWeiXn = exports.isWeiXn = function isWeiXn() {
838
+ return ua.toLowerCase().includes('micromessenger');
804
839
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dlt-for-react",
3
- "version": "1.0.8",
3
+ "version": "1.0.10",
4
4
  "description": "dlt for react",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {