easy3wui 4.0.39 → 4.0.41-beta.1

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 (15) hide show
  1. package/CHANGELOG.md +188 -188
  2. package/HISTORY.md +8 -8
  3. package/LICENSE.md +3 -3
  4. package/README.md +27 -2
  5. package/lib/Easy3wA/index.js +6 -2
  6. package/lib/Easy3wButton/index.js +6 -2
  7. package/lib/Easy3wButtonOne/index.js +6 -2
  8. package/lib/Easy3wFormPage/index.js +6 -2
  9. package/lib/Easy3wModal/index.js +18 -6
  10. package/lib/Easy3wNewFormPage/index.js +6 -2
  11. package/lib/Easy3wPositionButton/index.js +6 -2
  12. package/lib/Easy3wQryGrid/index.js +6 -2
  13. package/lib/Easy3wTagSelect/index.less +120 -120
  14. package/lib/Easy3wUploadB/index.js +24 -2
  15. package/package.json +118 -118
package/CHANGELOG.md CHANGED
@@ -1,189 +1,189 @@
1
- ---
2
- order: 6
3
- title: 更新日志
4
- toc: false
5
- timeline: true
6
- ---
7
-
8
-
9
- #### 版本号说明
10
- * 次版本号：带有新特性的向下兼容的版本。
11
- * 主版本号：含有破坏性更新和新特性。
12
- ## 1.1.105
13
- `2018-12-20`
14
-
15
- - Easy3wFormPage
16
- - 🌟 增加必填校验自定义文案属性：requiredMessage
17
- - 🌟 TextArea增加autosize属性
18
- - Easy3wQryGrid
19
- - 点重置后查询
20
- ---
21
- ## 1.1.101
22
- `2018-12-12`
23
-
24
- - Easy3wFormPage
25
- - 🌟 树选择默认提示改为：请输入关键字或点击三角箭头展开后选择
26
- ---Easy3wFormPage
27
- ---
28
- ## 1.1.100
29
- `2018-11-29`
30
-
31
- - Easy3wGridInputNumber
32
- - 🌟 设置默认宽度
33
- ---
34
- ## 1.1.92
35
- `2018-11-21`
36
-
37
- - Easy3wUpload
38
- - 🌟 超过限制大小不显示选择的附件
39
- - Easy3wUploadM
40
- - 🌟 超过限制大小不显示选择的附件
41
- - Easy3wGridPage
42
- - 🌟 Tooltip文本换行
43
- ---
44
- ## 1.1.90
45
- `2018-10-30`
46
-
47
- - Easy3wUserLayout
48
- - 🔥 动态粒子背景
49
- - Easy3wUploadB
50
- - 🌟 大附件上传成功后进度条消失
51
- ---
52
- ## 1.1.83
53
- `2018-10-25`
54
-
55
- - Easy3wModel
56
- - 🔥 底部按钮居中
57
- - Easy3wFlow
58
- - 🌟 非必须的步骤边框虚化
59
- ---
60
-
61
- ## 1.1.77
62
- `2018-10-17`
63
-
64
- - Easy3wGridPage
65
- - 🔥 固定列重复显示问题解决
66
- - Easy3wUpload
67
- - 🌟 大附件初始值bug修复
68
- - 🌟大附件增加上传成功回调方法：uploadDoneCallback(uploadName, fileInfo, newList);
69
- - Easy3wFlow
70
- - 🌟 流程向导url加密
71
- - Easy3wCaHandler
72
- - 🌟 增加获取供方名称接口：getSupplierName
73
- - Easy3wCaptcha
74
- - 🌟 验证码字体大小固定
75
- ---
76
-
77
- ## 1.1.61
78
- `2018-10-09`
79
-
80
- - Easy3wUpload
81
- - 🔥 附件大小为0不得上传
82
- - Easy3wModal
83
- - 🌟 增加默认到顶部的距离为20px
84
- - Easy3wGridDateTimePicker
85
- - 🔥 默认选中时间为9点
86
- - Easy3wFormPage
87
- - 🔥 增加getValueFromEvent属性
88
- - 🔥 时间组件修改，默认选中时间为9点
89
- ---
90
- ## 1.1.52
91
- `2018-09-27`
92
-
93
- - Easy3wModal
94
- - 增加destroyOnClose属性。
95
- - Easy3wFlow
96
- - 增加不重新获取流程数据参数。
97
- - 去除流程向导的loading。
98
- - Easy3wCaHandler
99
- - 🔥增加CA服务组件。
100
- - Easy3wCaHandler
101
- - 🔥增加CA服务组件。
102
- - Easy3wGetCookie
103
- - 🔥增加获取cookie组件。
104
- - Easy3wUploadB
105
- - 🔥增加大附件上传组件。
106
- ## 1.1.35
107
- `2018-09-17`
108
-
109
- - Easy3wGridPage
110
- - 🌟 如果列表需要固定表头则在Easy3wGridPage中添加属性：scroll={{ y: num, x: num }}并给添加类名：ClassName="scrollY",
111
- 列表横向滚动不需要自行添加滚动属性，整体列表为自适应宽度,如有表头fixed固定，表头不需要添加width属性
112
- - Easy3wButton
113
- - 🔥 增加dropdownArr属性，可设置下拉按钮组。
114
- ---
115
- ## 1.1.29
116
- `2018-09-13`
117
-
118
- - Easy3wFormPage
119
- - 🌟 改为紧凑型表单。
120
- - 🌟 增加rowAftBtnFlag属性。
121
- - Easy3wGridPage
122
- - 🌟 选中后返回的参数增加两个属性：selected：选中或取消选中，changeRows：改变的行。
123
- ------
124
- ## 1.1.19
125
- `2018-09-12`
126
-
127
- - 修复登录样式问题
128
- - 去除console.log
129
- ---
130
- ## 1.1.15
131
- `2018-09-08`
132
-
133
- - Easy3wButton
134
- - 🔥 增加btnType属性，可设置按钮类别，当btnType未设置时为主按钮，当btnType: secondary时为次按钮。
135
- - Easy3wGridInputNumber
136
- - 🐞 修复输入校验的bug。
137
- - Easy3wGridPage
138
- - 🐞 修复选择后返回数据错误的bug。
139
- - 🌟 优化选择的方法。
140
- ---
141
- ## 1.1.6
142
- `2018-08-27`
143
- -
144
- - Easy3wUploadM
145
- - 🐞 修复默认附件不能下载的bug。
146
- - 🌟 增加按钮前的扩展属性：extend，用于扩展上传按钮前的功能。
147
- - 🌟 增加按钮后的扩展属性：extendBack，用于扩展上传按钮后的功能。
148
- - 🌟 增加上传成功的回调 uploadDoneCallback(uploadName, fileList, file)。
149
- - 🌟 增加删除的回调removeCallback(uploadName, file)。
150
- -
151
- ---
152
-
153
- ## 1.1.2
154
- `2018-08-21`
155
- -
156
- - Easy3wButtonOne
157
- - 🔥 增加单个按钮组件，可配合form组件中的upload，生成类似【生成】【上传】的操作按钮组。
158
- - Easy3wUpload
159
- - 🌟 增加按钮前的扩展属性：extend，用于扩展上传按钮前的功能。
160
- - 🌟 增加按钮后的扩展属性：extendBack，用于扩展上传按钮后的功能。
161
- - Easy3wQryGrid
162
- - 🌟 增加隐藏域属性：hiddenItems。
163
- ---
164
-
165
- ## 1.1.1
166
- `2018-08-16`
167
- - Easy3wGridPage
168
- - 🌟 增加复选框默认不可修改功能：getCheckboxProps。
169
- ---
170
-
171
- ## 1.0.95
172
- `2018-08-13`
173
- - Easy3wUpload
174
- - 🌟 增加上传成功后的回调方法：uploadDoneCallback，增加点击删除后的回调方法：removeCallback。
175
- - 🌟 当为isRead时，去除删除图标。
176
- ---
177
-
178
- ## 1.0.94
179
- `2018-08-12`
180
- - Easy3wFormPage
181
- - 🌟 treeSelect 去除labelInValue默认属性，可由cmptPros自行设置。
182
-
183
- - Easy3wQryGrid
184
- - 🌟 treeSelect 去除labelInValue默认属性，可由cmptPros自行设置。
185
- - 可输入组件
186
- - 增加Easy3wGridInput、Easy3wGridInputNumber、Easy3wGridTextArea、Easy3wGridSelect、Easy3wGridDatePicker、Easy3wGridDateTimePicker、Easy3wGridRadio、Easy3wGridCheckBox组件，以实现在表格中编辑的功能。
187
-
188
- - Easy3wDownLoad
1
+ ---
2
+ order: 6
3
+ title: 更新日志
4
+ toc: false
5
+ timeline: true
6
+ ---
7
+
8
+
9
+ #### 版本号说明
10
+ * 次版本号：带有新特性的向下兼容的版本。
11
+ * 主版本号：含有破坏性更新和新特性。
12
+ ## 1.1.105
13
+ `2018-12-20`
14
+
15
+ - Easy3wFormPage
16
+ - 🌟 增加必填校验自定义文案属性：requiredMessage
17
+ - 🌟 TextArea增加autosize属性
18
+ - Easy3wQryGrid
19
+ - 点重置后查询
20
+ ---
21
+ ## 1.1.101
22
+ `2018-12-12`
23
+
24
+ - Easy3wFormPage
25
+ - 🌟 树选择默认提示改为：请输入关键字或点击三角箭头展开后选择
26
+ ---Easy3wFormPage
27
+ ---
28
+ ## 1.1.100
29
+ `2018-11-29`
30
+
31
+ - Easy3wGridInputNumber
32
+ - 🌟 设置默认宽度
33
+ ---
34
+ ## 1.1.92
35
+ `2018-11-21`
36
+
37
+ - Easy3wUpload
38
+ - 🌟 超过限制大小不显示选择的附件
39
+ - Easy3wUploadM
40
+ - 🌟 超过限制大小不显示选择的附件
41
+ - Easy3wGridPage
42
+ - 🌟 Tooltip文本换行
43
+ ---
44
+ ## 1.1.90
45
+ `2018-10-30`
46
+
47
+ - Easy3wUserLayout
48
+ - 🔥 动态粒子背景
49
+ - Easy3wUploadB
50
+ - 🌟 大附件上传成功后进度条消失
51
+ ---
52
+ ## 1.1.83
53
+ `2018-10-25`
54
+
55
+ - Easy3wModel
56
+ - 🔥 底部按钮居中
57
+ - Easy3wFlow
58
+ - 🌟 非必须的步骤边框虚化
59
+ ---
60
+
61
+ ## 1.1.77
62
+ `2018-10-17`
63
+
64
+ - Easy3wGridPage
65
+ - 🔥 固定列重复显示问题解决
66
+ - Easy3wUpload
67
+ - 🌟 大附件初始值bug修复
68
+ - 🌟大附件增加上传成功回调方法：uploadDoneCallback(uploadName, fileInfo, newList);
69
+ - Easy3wFlow
70
+ - 🌟 流程向导url加密
71
+ - Easy3wCaHandler
72
+ - 🌟 增加获取供方名称接口：getSupplierName
73
+ - Easy3wCaptcha
74
+ - 🌟 验证码字体大小固定
75
+ ---
76
+
77
+ ## 1.1.61
78
+ `2018-10-09`
79
+
80
+ - Easy3wUpload
81
+ - 🔥 附件大小为0不得上传
82
+ - Easy3wModal
83
+ - 🌟 增加默认到顶部的距离为20px
84
+ - Easy3wGridDateTimePicker
85
+ - 🔥 默认选中时间为9点
86
+ - Easy3wFormPage
87
+ - 🔥 增加getValueFromEvent属性
88
+ - 🔥 时间组件修改，默认选中时间为9点
89
+ ---
90
+ ## 1.1.52
91
+ `2018-09-27`
92
+
93
+ - Easy3wModal
94
+ - 增加destroyOnClose属性。
95
+ - Easy3wFlow
96
+ - 增加不重新获取流程数据参数。
97
+ - 去除流程向导的loading。
98
+ - Easy3wCaHandler
99
+ - 🔥增加CA服务组件。
100
+ - Easy3wCaHandler
101
+ - 🔥增加CA服务组件。
102
+ - Easy3wGetCookie
103
+ - 🔥增加获取cookie组件。
104
+ - Easy3wUploadB
105
+ - 🔥增加大附件上传组件。
106
+ ## 1.1.35
107
+ `2018-09-17`
108
+
109
+ - Easy3wGridPage
110
+ - 🌟 如果列表需要固定表头则在Easy3wGridPage中添加属性：scroll={{ y: num, x: num }}并给添加类名：ClassName="scrollY",
111
+ 列表横向滚动不需要自行添加滚动属性，整体列表为自适应宽度,如有表头fixed固定，表头不需要添加width属性
112
+ - Easy3wButton
113
+ - 🔥 增加dropdownArr属性，可设置下拉按钮组。
114
+ ---
115
+ ## 1.1.29
116
+ `2018-09-13`
117
+
118
+ - Easy3wFormPage
119
+ - 🌟 改为紧凑型表单。
120
+ - 🌟 增加rowAftBtnFlag属性。
121
+ - Easy3wGridPage
122
+ - 🌟 选中后返回的参数增加两个属性：selected：选中或取消选中，changeRows：改变的行。
123
+ ------
124
+ ## 1.1.19
125
+ `2018-09-12`
126
+
127
+ - 修复登录样式问题
128
+ - 去除console.log
129
+ ---
130
+ ## 1.1.15
131
+ `2018-09-08`
132
+
133
+ - Easy3wButton
134
+ - 🔥 增加btnType属性，可设置按钮类别，当btnType未设置时为主按钮，当btnType: secondary时为次按钮。
135
+ - Easy3wGridInputNumber
136
+ - 🐞 修复输入校验的bug。
137
+ - Easy3wGridPage
138
+ - 🐞 修复选择后返回数据错误的bug。
139
+ - 🌟 优化选择的方法。
140
+ ---
141
+ ## 1.1.6
142
+ `2018-08-27`
143
+ -
144
+ - Easy3wUploadM
145
+ - 🐞 修复默认附件不能下载的bug。
146
+ - 🌟 增加按钮前的扩展属性：extend，用于扩展上传按钮前的功能。
147
+ - 🌟 增加按钮后的扩展属性：extendBack，用于扩展上传按钮后的功能。
148
+ - 🌟 增加上传成功的回调 uploadDoneCallback(uploadName, fileList, file)。
149
+ - 🌟 增加删除的回调removeCallback(uploadName, file)。
150
+ -
151
+ ---
152
+
153
+ ## 1.1.2
154
+ `2018-08-21`
155
+ -
156
+ - Easy3wButtonOne
157
+ - 🔥 增加单个按钮组件，可配合form组件中的upload，生成类似【生成】【上传】的操作按钮组。
158
+ - Easy3wUpload
159
+ - 🌟 增加按钮前的扩展属性：extend，用于扩展上传按钮前的功能。
160
+ - 🌟 增加按钮后的扩展属性：extendBack，用于扩展上传按钮后的功能。
161
+ - Easy3wQryGrid
162
+ - 🌟 增加隐藏域属性：hiddenItems。
163
+ ---
164
+
165
+ ## 1.1.1
166
+ `2018-08-16`
167
+ - Easy3wGridPage
168
+ - 🌟 增加复选框默认不可修改功能：getCheckboxProps。
169
+ ---
170
+
171
+ ## 1.0.95
172
+ `2018-08-13`
173
+ - Easy3wUpload
174
+ - 🌟 增加上传成功后的回调方法：uploadDoneCallback，增加点击删除后的回调方法：removeCallback。
175
+ - 🌟 当为isRead时，去除删除图标。
176
+ ---
177
+
178
+ ## 1.0.94
179
+ `2018-08-12`
180
+ - Easy3wFormPage
181
+ - 🌟 treeSelect 去除labelInValue默认属性，可由cmptPros自行设置。
182
+
183
+ - Easy3wQryGrid
184
+ - 🌟 treeSelect 去除labelInValue默认属性，可由cmptPros自行设置。
185
+ - 可输入组件
186
+ - 增加Easy3wGridInput、Easy3wGridInputNumber、Easy3wGridTextArea、Easy3wGridSelect、Easy3wGridDatePicker、Easy3wGridDateTimePicker、Easy3wGridRadio、Easy3wGridCheckBox组件，以实现在表格中编辑的功能。
187
+
188
+ - Easy3wDownLoad
189
189
  - 🔥 增加下载组件。
package/HISTORY.md CHANGED
@@ -1,8 +1,8 @@
1
- # History
2
- ----
3
-
4
- ## 0.0.60 / 2018-05-14
5
-
6
- - Add ``.
7
-
8
- -
1
+ # History
2
+ ----
3
+
4
+ ## 0.0.60 / 2018-05-14
5
+
6
+ - Add ``.
7
+
8
+ -
package/LICENSE.md CHANGED
@@ -1,4 +1,4 @@
1
-
2
- Copyright (c) 上海同在互联网科技有限公司 版权所有
3
-
1
+
2
+ Copyright (c) 上海同在互联网科技有限公司 版权所有
3
+
4
4
  上海同在互联网科技有限公司 版权所有，使用必须获得授权，否则将追究法律责任。
package/README.md CHANGED
@@ -1,2 +1,27 @@
1
- # easy3wUI
2
- easy3w UI 组件
1
+ # easy3wUI
2
+ easy3w UI 组件
3
+ # 编译
4
+ npm run compile
5
+ # 发布代码
6
+ npm publish
7
+ # 测试版发布
8
+ npm publish --tag beta
9
+
10
+ react-data-grid使用6.0.1版本对应的react@16
11
+ 7版本未形成稳定版本，暂时使用6.0.1版本；对应的react@18+版本
12
+ https://www.npmjs.com/
13
+ 登录npm
14
+ 在终端输入npm login ,在登录前一定要将npm源设置为官方源
15
+ // 官方镜像源
16
+ npm config set registry https://registry.npmjs.org/
17
+ // 淘宝镜像源
18
+ npm config set registry http://registry.npm.taobao.org/
19
+ 检查当前npm源：
20
+ npm config get registry
21
+
22
+ # 生成令牌‌‌操作步骤‌：
23
+ * 登录 npm 官网，进入令牌管理页面（https://www.npmjs.com/settings/(您的用户名)/tokens）。
24
+ * ‌删除旧令牌‌：点击令牌右侧的“Delete”（删除）按钮。
25
+ * ‌创建新令牌‌：点击“Generate New Token”（生成新令牌），输入名称并勾选“Bypass two-factor authentication”（绕过 2FA）。
26
+ * ‌立即复制新令牌‌：创建后立即点击复制按钮，‌避免离开页面‌。
27
+ * 配置令牌到 .npmrc 文件,在项目根目录下
package/lib/Easy3wA/index.js CHANGED
@@ -51,8 +51,12 @@ var Easy3wA = function (_Component) {
51
51
  }
52
52
 
53
53
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
54
- var globalLoading = _this.props.loading.global;
55
- if (globalLoading) {
54
+ var _this$props$loading = _this.props.loading,
55
+ globalLoading = _this$props$loading.global,
56
+ globalFetchLoading = _this$props$loading.globalFetch,
57
+ globalBlackLoading = _this$props$loading.globalBlack;
58
+
59
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
56
60
  _notification2['default'].warning({
57
61
  message: '温馨提示',
58
62
  description: '正在后台处理，请稍后！',
package/lib/Easy3wButton/index.js CHANGED
@@ -91,8 +91,12 @@ var Easy3wButton = function (_Component) {
91
91
  }
92
92
 
93
93
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (func) {
94
- var globalLoading = _this.props.loading.global;
95
- if (globalLoading) {
94
+ var _this$props$loading = _this.props.loading,
95
+ globalLoading = _this$props$loading.global,
96
+ globalFetchLoading = _this$props$loading.globalFetch,
97
+ globalBlackLoading = _this$props$loading.globalBlack;
98
+
99
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
96
100
  _notification2['default'].warning({
97
101
  message: '温馨提示',
98
102
  description: '正在后台处理，请稍后！',
package/lib/Easy3wButtonOne/index.js CHANGED
@@ -63,8 +63,12 @@ var Easy3wButtonOne = function (_Component) {
63
63
  }
64
64
 
65
65
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
66
- var globalLoading = _this.props.loadingFlag.global;
67
- if (globalLoading) {
66
+ var _this$props$loadingFl = _this.props.loadingFlag,
67
+ globalLoading = _this$props$loadingFl.global,
68
+ globalFetchLoading = _this$props$loadingFl.globalFetch,
69
+ globalBlackLoading = _this$props$loadingFl.globalBlack;
70
+
71
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
68
72
  _notification3['default'].warning({
69
73
  message: '温馨提示',
70
74
  description: '正在后台处理，请稍后！',
package/lib/Easy3wFormPage/index.js CHANGED
@@ -282,8 +282,12 @@ var Easy3wFormPage = function (_Component) {
282
282
  }
283
283
 
284
284
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
285
- var globalLoading = _this.props.loadingFlag.global;
286
- if (globalLoading) {
285
+ var _this$props$loadingFl = _this.props.loadingFlag,
286
+ globalLoading = _this$props$loadingFl.global,
287
+ globalFetchLoading = _this$props$loadingFl.globalFetch,
288
+ globalBlackLoading = _this$props$loadingFl.globalBlack;
289
+
290
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
287
291
  _notification3['default'].warning({
288
292
  message: '温馨提示',
289
293
  description: '正在后台处理，请稍后！',
package/lib/Easy3wModal/index.js CHANGED
@@ -67,8 +67,12 @@ var Easy3wModal = function (_Component) {
67
67
  }
68
68
 
69
69
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
70
- var globalLoading = _this.props.loadingFlag.global;
71
- if (globalLoading) {
70
+ var _this$props$loadingFl = _this.props.loadingFlag,
71
+ globalLoading = _this$props$loadingFl.global,
72
+ globalFetchLoading = _this$props$loadingFl.globalFetch,
73
+ globalBlackLoading = _this$props$loadingFl.globalBlack;
74
+
75
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
72
76
  _notification3['default'].warning({
73
77
  message: '温馨提示',
74
78
  description: '正在后台处理，请稍后！',
@@ -148,8 +152,12 @@ var Easy3wModal = function (_Component) {
148
152
  },
149
153
  onOk: function onOk() {
150
154
  // 1. 检查全局 loading 状态，阻止重复操作
151
- var loadingFlag = Easy3wModal.getLoading();
152
- if (loadingFlag) {
155
+ var _ref = Easy3wModal.getLoading() || {},
156
+ globalLoading = _ref.global,
157
+ globalFetchLoading = _ref.globalFetch,
158
+ globalBlackLoading = _ref.globalBlack;
159
+
160
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
153
161
  _notification3['default'].warning({
154
162
  message: '温馨提示',
155
163
  description: '操作正在进行中，请稍后！',
@@ -212,8 +220,12 @@ var Easy3wModal = function (_Component) {
212
220
  },
213
221
  onOk: function onOk() {
214
222
  if (_onOk2) {
215
- var loadingFlag = Easy3wModal.getLoading();
216
- if (loadingFlag) {
223
+ var _ref2 = Easy3wModal.getLoading() || {},
224
+ globalLoading = _ref2.global,
225
+ globalFetchLoading = _ref2.globalFetch,
226
+ globalBlackLoading = _ref2.globalBlack;
227
+
228
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
217
229
  _notification3['default'].warning({
218
230
  message: '温馨提示',
219
231
  description: '操作正在进行中，请稍后！',
package/lib/Easy3wNewFormPage/index.js CHANGED
@@ -281,8 +281,12 @@ var Easy3wNewFormPage = function (_Component) {
281
281
  }
282
282
 
283
283
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (e, func) {
284
- var globalLoading = _this.props.loadingFlag.global;
285
- if (globalLoading) {
284
+ var _this$props$loadingFl = _this.props.loadingFlag,
285
+ globalLoading = _this$props$loadingFl.global,
286
+ globalFetchLoading = _this$props$loadingFl.globalFetch,
287
+ globalBlackLoading = _this$props$loadingFl.globalBlack;
288
+
289
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
286
290
  _notification3['default'].warning({
287
291
  message: '温馨提示',
288
292
  description: '正在后台处理，请稍后！',
package/lib/Easy3wPositionButton/index.js CHANGED
@@ -45,8 +45,12 @@ var Easy3wPositionButton = function (_Component) {
45
45
  }
46
46
 
47
47
  return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onClickFunc = function (func) {
48
- var globalLoading = _this.props.loading.global;
49
- if (globalLoading) {
48
+ var _this$props$loading = _this.props.loading,
49
+ globalLoading = _this$props$loading.global,
50
+ globalFetchLoading = _this$props$loading.globalFetch,
51
+ globalBlackLoading = _this$props$loading.globalBlack;
52
+
53
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
50
54
  _notification2['default'].warning({
51
55
  message: '温馨提示',
52
56
  description: '正在后台处理，请稍后！',
package/lib/Easy3wQryGrid/index.js CHANGED
@@ -455,8 +455,12 @@ var Easy3wQryGrid = function (_Component) {
455
455
 
456
456
  return _react2['default'].createElement(_cascader2['default'], cmptPros);
457
457
  }, _this.handleSearch = function () {
458
- var globalLoading = _this.props.loading.global;
459
- if (globalLoading) {
458
+ var _this$props$loading = _this.props.loading,
459
+ globalLoading = _this$props$loading.global,
460
+ globalFetchLoading = _this$props$loading.globalFetch,
461
+ globalBlackLoading = _this$props$loading.globalBlack;
462
+
463
+ if (globalLoading || globalFetchLoading || globalBlackLoading) {
460
464
  _notification2['default'].warning({
461
465
  message: '温馨提示',
462
466
  description: '正在后台处理，请稍后！',
package/lib/Easy3wTagSelect/index.less CHANGED
@@ -1,120 +1,120 @@
1
- @import '~antd/lib/style/themes/default.less';
2
-
3
- .tagSelect {
4
- user-select: none;
5
- margin-left: -8px;
6
- position: relative;
7
- overflow: hidden;
8
- max-height: 32px;
9
- // line-height: 32px;
10
- transition: all 0.3s;
11
- :global {
12
- .ant-tag {
13
- padding: 0 8px;
14
- margin-right: 24px;
15
- font-size: @font-size-base;
16
- }
17
- }
18
- &.expanded {
19
- transition: all 0.3s;
20
- max-height: 800px;
21
- }
22
- .trigger {
23
- position: absolute;
24
- top: 0;
25
- right: 0;
26
- i {
27
- font-size: 12px;
28
- }
29
- }
30
- &.hasExpandTag {
31
- padding-right: 50px;
32
- }
33
- }
34
-
35
- .standardFormRow {
36
- border-bottom: 1px dashed @border-color-split;
37
- // padding-bottom: 8px;
38
- // margin-bottom: 8px;
39
- display: flex;
40
- :global {
41
- .ant-form-item {
42
- margin-right: 24px;
43
- }
44
- .ant-form-item-label label {
45
- color: @text-color;
46
- margin-right: 0;
47
- }
48
- .ant-form-item-label,
49
- .ant-form-item-control {
50
- padding: 0;
51
- line-height: 32px;
52
- }
53
- }
54
- .label {
55
- // color: @heading-color;
56
- // color: rgb(173,124,89);
57
- font-size: @font-size-base;
58
- padding-right: 12px;
59
- margin-right: 12px;
60
- // margin-right: 24px;
61
- background:#F8F8FF;
62
- // background: rgb(84, 104, 178);
63
- // opacity: 0.5;
64
- flex: 0 0 auto;
65
- text-align: right;
66
- & > span {
67
- display: inline-block;
68
- height: 32px;
69
- line-height: 32px;
70
- &:after {
71
- content: '|';
72
- }
73
- }
74
- // border-radius: 2px;
75
- & > a {
76
- color: @heading-color;
77
- // color: rgb(255, 255, 255);
78
- display: inline-block;
79
- height: 32px;
80
- line-height: 32px;
81
- // width: 100%;
82
- cursor: pointer;
83
- }
84
- }
85
- .content {
86
- flex: 1 1 0;
87
- :global {
88
- .ant-form-item:last-child {
89
- margin-right: 0;
90
- }
91
- }
92
- }
93
- }
94
-
95
- .standardFormRowLast {
96
- border: none;
97
- padding-bottom: 0;
98
- margin-bottom: 0;
99
- }
100
-
101
- .standardFormRowBlock {
102
- :global {
103
- .ant-form-item,
104
- div.ant-form-item-control-wrapper {
105
- display: block;
106
- }
107
- }
108
- }
109
-
110
- .standardFormRowGrid {
111
- :global {
112
- .ant-form-item,
113
- div.ant-form-item-control-wrapper {
114
- display: block;
115
- }
116
- .ant-form-item-label {
117
- float: left;
118
- }
119
- }
120
- }
1
+ @import '~antd/lib/style/themes/default.less';
2
+
3
+ .tagSelect {
4
+ user-select: none;
5
+ margin-left: -8px;
6
+ position: relative;
7
+ overflow: hidden;
8
+ max-height: 32px;
9
+ // line-height: 32px;
10
+ transition: all 0.3s;
11
+ :global {
12
+ .ant-tag {
13
+ padding: 0 8px;
14
+ margin-right: 24px;
15
+ font-size: @font-size-base;
16
+ }
17
+ }
18
+ &.expanded {
19
+ transition: all 0.3s;
20
+ max-height: 800px;
21
+ }
22
+ .trigger {
23
+ position: absolute;
24
+ top: 0;
25
+ right: 0;
26
+ i {
27
+ font-size: 12px;
28
+ }
29
+ }
30
+ &.hasExpandTag {
31
+ padding-right: 50px;
32
+ }
33
+ }
34
+
35
+ .standardFormRow {
36
+ border-bottom: 1px dashed @border-color-split;
37
+ // padding-bottom: 8px;
38
+ // margin-bottom: 8px;
39
+ display: flex;
40
+ :global {
41
+ .ant-form-item {
42
+ margin-right: 24px;
43
+ }
44
+ .ant-form-item-label label {
45
+ color: @text-color;
46
+ margin-right: 0;
47
+ }
48
+ .ant-form-item-label,
49
+ .ant-form-item-control {
50
+ padding: 0;
51
+ line-height: 32px;
52
+ }
53
+ }
54
+ .label {
55
+ // color: @heading-color;
56
+ // color: rgb(173,124,89);
57
+ font-size: @font-size-base;
58
+ padding-right: 12px;
59
+ margin-right: 12px;
60
+ // margin-right: 24px;
61
+ background:#F8F8FF;
62
+ // background: rgb(84, 104, 178);
63
+ // opacity: 0.5;
64
+ flex: 0 0 auto;
65
+ text-align: right;
66
+ & > span {
67
+ display: inline-block;
68
+ height: 32px;
69
+ line-height: 32px;
70
+ &:after {
71
+ content: '|';
72
+ }
73
+ }
74
+ // border-radius: 2px;
75
+ & > a {
76
+ color: @heading-color;
77
+ // color: rgb(255, 255, 255);
78
+ display: inline-block;
79
+ height: 32px;
80
+ line-height: 32px;
81
+ // width: 100%;
82
+ cursor: pointer;
83
+ }
84
+ }
85
+ .content {
86
+ flex: 1 1 0;
87
+ :global {
88
+ .ant-form-item:last-child {
89
+ margin-right: 0;
90
+ }
91
+ }
92
+ }
93
+ }
94
+
95
+ .standardFormRowLast {
96
+ border: none;
97
+ padding-bottom: 0;
98
+ margin-bottom: 0;
99
+ }
100
+
101
+ .standardFormRowBlock {
102
+ :global {
103
+ .ant-form-item,
104
+ div.ant-form-item-control-wrapper {
105
+ display: block;
106
+ }
107
+ }
108
+ }
109
+
110
+ .standardFormRowGrid {
111
+ :global {
112
+ .ant-form-item,
113
+ div.ant-form-item-control-wrapper {
114
+ display: block;
115
+ }
116
+ .ant-form-item-label {
117
+ float: left;
118
+ }
119
+ }
120
+ }
package/lib/Easy3wUploadB/index.js CHANGED
@@ -82,6 +82,10 @@ var _Easy3wAESEncrypt = require('./../Easy3wAESEncrypt');
82
82
 
83
83
  var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
84
84
 
85
+ var _Easy3wDownLoad = require('./../Easy3wDownLoad');
86
+
87
+ var _Easy3wDownLoad2 = _interopRequireDefault(_Easy3wDownLoad);
88
+
85
89
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
86
90
 
87
91
  var formItemStyle = {
@@ -164,7 +168,9 @@ var BigFileUpload = function (_Component) {
164
168
  wrapperCol = _props.wrapperCol,
165
169
  showUploadList = _props.showUploadList,
166
170
  multiple = _props.multiple,
167
- fileViewFlag = _props.fileViewFlag;
171
+ fileViewFlag = _props.fileViewFlag,
172
+ urlDownloadFile = _props.urlDownloadFile,
173
+ initialValue = _props.initialValue;
168
174
  var _state = this.state,
169
175
  preUploading = _state.preUploading,
170
176
  uploadPercent = _state.uploadPercent,
@@ -331,7 +337,23 @@ var BigFileUpload = function (_Component) {
331
337
  if (previewFileFlag && fileViewFlag !== false) {
332
338
  uploadProp.onPreview = this.onPreview;
333
339
  }
334
- return _react2['default'].createElement(
340
+ return isRead ? _react2['default'].createElement(
341
+ _compatible.Form.Item,
342
+ {
343
+ label: label,
344
+ className: className,
345
+ labelCol: labelCol,
346
+ wrapperCol: wrapperCol,
347
+ style: formItemStyle
348
+ },
349
+ getFieldDecorator('' + name, {})(_react2['default'].createElement(_Easy3wDownLoad2['default'], {
350
+ pdfViewFlag: true,
351
+ imgVisible: true,
352
+ urlDownloadFile: urlDownloadFile,
353
+ downloadArr: initialValue,
354
+ objPreviewFile: objPreviewFileNew
355
+ }))
356
+ ) : _react2['default'].createElement(
335
357
  _compatible.Form.Item,
336
358
  {
337
359
  label: label,
package/package.json CHANGED
@@ -1,118 +1,118 @@
1
- {
2
- "name": "easy3wui",
3
- "version": "4.0.39",
4
- "description": "easy3wui components for react",
5
- "keywords": [
6
- "react",
7
- "easy3wui"
8
- ],
9
- "homepage": "https://github.com/alsmill/easy3wUI",
10
- "maintainers": [
11
- "chenc@easy3w.com",
12
- "zhanggl@easy3w.com"
13
- ],
14
- "repository": {
15
- "type": "git",
16
- "url": "git@github.com:alsmill/easy3wUI.git"
17
- },
18
- "bugs": {
19
- "url": "https://github.com/alsmill/easy3wUI/issues"
20
- },
21
- "files": [
22
- "lib",
23
- "assets/*.css"
24
- ],
25
- "main": "lib/index",
26
- "license": "上海同在互联网科技有限公司 版权所有",
27
- "config": {
28
- "port": 8006,
29
- "entry": {
30
- "easy3wui": [
31
- "./assets/index.less",
32
- "./src/index.js"
33
- ]
34
- }
35
- },
36
- "scripts": {
37
- "build": "rc-tools run build",
38
- "compile": "rc-tools run compile --babel-runtime",
39
- "gh-pages": "rc-tools run gh-pages",
40
- "start": "rc-tools --max_old_space_size=4096 run server",
41
- "pub": "rc-tools run pub",
42
- "lint": "rc-tools run lint",
43
- "karma": "rc-test run karma",
44
- "saucelabs": "rc-test run saucelabs",
45
- "test": "rc-test run test",
46
- "chrome-test": "rc-test run chrome-test",
47
- "coverage": "rc-test run coverage"
48
- },
49
- "devDependencies": {
50
- "axios": "^0.17.1",
51
- "babel-eslint": "^8.0.1",
52
- "babel-jest": "^21.0.0",
53
- "babel-plugin-dva-hmr": "^0.3.2",
54
- "babel-plugin-import": "^1.2.1",
55
- "babel-plugin-transform-class-properties": "^6.24.1",
56
- "babel-plugin-transform-decorators-legacy": "^1.3.4",
57
- "babel-plugin-transform-runtime": "^6.9.0",
58
- "babel-preset-env": "^1.6.1",
59
- "babel-preset-react": "^6.24.1",
60
- "babel-runtime": "^6.26.0",
61
- "cross-env": "^5.1.1",
62
- "cross-port-killer": "^1.0.1",
63
- "dva": "^2.1.0",
64
- "enzyme": "^3.1.0",
65
- "enzyme-adapter-react-16": "^1.0.2",
66
- "eslint": "^4.8.0",
67
- "eslint-config-airbnb": "^16.0.0",
68
- "eslint-plugin-babel": "^4.0.0",
69
- "eslint-plugin-compat": "^2.1.0",
70
- "eslint-plugin-import": "^2.2.0",
71
- "eslint-plugin-jsx-a11y": "^6.0.0",
72
- "eslint-plugin-markdown": "^1.0.0-beta.6",
73
- "eslint-plugin-react": "^7.0.1",
74
- "gh-pages": "^1.0.0",
75
- "husky": "^0.14.3",
76
- "jest": "^21.0.1",
77
- "lint-staged": "^4.3.0",
78
- "mockjs": "^1.0.1-beta3",
79
- "numeral": "^2.0.6",
80
- "pre-commit": "1.x",
81
- "prettier": "^1.9.0",
82
- "pro-download": "^1.0.0",
83
- "prop-types": "^15.5.8",
84
- "rc-test": "^6.0.8",
85
- "rc-tools": "^7.0.2",
86
- "rc-trigger": "^2.2.2",
87
- "react": "16.8.6",
88
- "react-container-query": "^0.11.0",
89
- "react-document-title": "^2.0.3",
90
- "react-dom": "16.8.6",
91
- "react-test-renderer": "^16.0.0",
92
- "redbox-react": "^1.3.2",
93
- "roadhog": "^2.5.0-beta.4",
94
- "roadhog-api-doc": "^1.0.3",
95
- "rollbar": "^2.3.1",
96
- "stylelint": "^8.1.0",
97
- "stylelint-config-standard": "^17.0.0"
98
- },
99
- "pre-commit": [
100
- "lint"
101
- ],
102
- "dependencies": {
103
- "@ant-design/compatible": "^1.0.1",
104
- "@ant-design/icons": "^4.0.2",
105
- "@hanyk/rc-viewer": "^0.0.3",
106
- "antd": "4.0.3",
107
- "braft-editor": "^2.3.8",
108
- "braft-extensions": "^0.1.1",
109
- "lodash": "4.17.11",
110
- "react-images": "^1.0.0",
111
- "react-number-format": "^4.3.1",
112
- "react-number-input": "^15.5.1",
113
- "react-pdf": "^4.0.5",
114
- "react-zmage": "^0.8.5",
115
- "spark-md5": "^3.0.0",
116
- "superagent": "^3.8.3"
117
- }
118
- }
1
+ {
2
+ "name": "easy3wui",
3
+ "version": "4.0.41-beta.1",
4
+ "description": "easy3wui components for react",
5
+ "keywords": [
6
+ "react",
7
+ "easy3wui"
8
+ ],
9
+ "homepage": "https://github.com/alsmill/easy3wUI",
10
+ "maintainers": [
11
+ "chenc@easy3w.com",
12
+ "zhanggl@easy3w.com"
13
+ ],
14
+ "repository": {
15
+ "type": "git",
16
+ "url": "git@github.com:alsmill/easy3wUI.git"
17
+ },
18
+ "bugs": {
19
+ "url": "https://github.com/alsmill/easy3wUI/issues"
20
+ },
21
+ "files": [
22
+ "lib",
23
+ "assets/*.css"
24
+ ],
25
+ "main": "lib/index",
26
+ "license": "上海同在互联网科技有限公司 版权所有",
27
+ "config": {
28
+ "port": 8006,
29
+ "entry": {
30
+ "easy3wui": [
31
+ "./assets/index.less",
32
+ "./src/index.js"
33
+ ]
34
+ }
35
+ },
36
+ "scripts": {
37
+ "build": "rc-tools run build",
38
+ "compile": "rc-tools run compile --babel-runtime",
39
+ "gh-pages": "rc-tools run gh-pages",
40
+ "start": "rc-tools --max_old_space_size=4096 run server",
41
+ "pub": "rc-tools run pub",
42
+ "lint": "rc-tools run lint",
43
+ "karma": "rc-test run karma",
44
+ "saucelabs": "rc-test run saucelabs",
45
+ "test": "rc-test run test",
46
+ "chrome-test": "rc-test run chrome-test",
47
+ "coverage": "rc-test run coverage"
48
+ },
49
+ "devDependencies": {
50
+ "axios": "^0.17.1",
51
+ "babel-eslint": "^8.0.1",
52
+ "babel-jest": "^21.0.0",
53
+ "babel-plugin-dva-hmr": "^0.3.2",
54
+ "babel-plugin-import": "^1.2.1",
55
+ "babel-plugin-transform-class-properties": "^6.24.1",
56
+ "babel-plugin-transform-decorators-legacy": "^1.3.4",
57
+ "babel-plugin-transform-runtime": "^6.9.0",
58
+ "babel-preset-env": "^1.6.1",
59
+ "babel-preset-react": "^6.24.1",
60
+ "babel-runtime": "^6.26.0",
61
+ "cross-env": "^5.1.1",
62
+ "cross-port-killer": "^1.0.1",
63
+ "dva": "^2.1.0",
64
+ "enzyme": "^3.1.0",
65
+ "enzyme-adapter-react-16": "^1.0.2",
66
+ "eslint": "^4.8.0",
67
+ "eslint-config-airbnb": "^16.0.0",
68
+ "eslint-plugin-babel": "^4.0.0",
69
+ "eslint-plugin-compat": "^2.1.0",
70
+ "eslint-plugin-import": "^2.2.0",
71
+ "eslint-plugin-jsx-a11y": "^6.0.0",
72
+ "eslint-plugin-markdown": "^1.0.0-beta.6",
73
+ "eslint-plugin-react": "^7.0.1",
74
+ "gh-pages": "^1.0.0",
75
+ "husky": "^0.14.3",
76
+ "jest": "^21.0.1",
77
+ "lint-staged": "^4.3.0",
78
+ "mockjs": "^1.0.1-beta3",
79
+ "numeral": "^2.0.6",
80
+ "pre-commit": "1.x",
81
+ "prettier": "^1.9.0",
82
+ "pro-download": "^1.0.0",
83
+ "prop-types": "^15.5.8",
84
+ "rc-test": "^6.0.8",
85
+ "rc-tools": "^7.0.2",
86
+ "rc-trigger": "^2.2.2",
87
+ "react": "16.8.6",
88
+ "react-container-query": "^0.11.0",
89
+ "react-document-title": "^2.0.3",
90
+ "react-dom": "16.8.6",
91
+ "react-test-renderer": "^16.0.0",
92
+ "redbox-react": "^1.3.2",
93
+ "roadhog": "^2.5.0-beta.4",
94
+ "roadhog-api-doc": "^1.0.3",
95
+ "rollbar": "^2.3.1",
96
+ "stylelint": "^8.1.0",
97
+ "stylelint-config-standard": "^17.0.0"
98
+ },
99
+ "pre-commit": [
100
+ "lint"
101
+ ],
102
+ "dependencies": {
103
+ "@ant-design/compatible": "^1.0.1",
104
+ "@ant-design/icons": "^4.0.2",
105
+ "@hanyk/rc-viewer": "^0.0.3",
106
+ "antd": "4.0.3",
107
+ "braft-editor": "^2.3.8",
108
+ "braft-extensions": "^0.1.1",
109
+ "lodash": "4.17.11",
110
+ "react-images": "^1.0.0",
111
+ "react-number-format": "^4.3.1",
112
+ "react-number-input": "^15.5.1",
113
+ "react-pdf": "^4.0.5",
114
+ "react-zmage": "^0.8.5",
115
+ "spark-md5": "^3.0.0",
116
+ "superagent": "^3.8.3"
117
+ }
118
+ }