@luck-design-biz/luckda 0.0.21-UI-1 → 0.0.22-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 (7) hide show
  1. package/es/upload/Form/gridForm.js +18 -13
  2. package/es/upload/Form/index.js +2 -1
  3. package/es/utils/grid.js +3 -1
  4. package/lib/upload/Form/gridForm.js +18 -13
  5. package/lib/upload/Form/index.js +2 -1
  6. package/lib/utils/grid.js +3 -1
  7. package/package.json +2 -1
package/es/upload/Form/gridForm.js CHANGED
@@ -114,17 +114,17 @@ var UploadGridForm = function UploadGridForm(_ref) {
114
114
  }
115
115
  if (file.status === 'done' && file.response && file.response.code === 1) {
116
116
  var _file$response2 = file.response,
117
- _list = _file$response2.list,
118
- _detail = _file$response2.detail;
117
+ list = _file$response2.list,
118
+ detail = _file$response2.detail;
119
119
  var data = {
120
- uid: _detail[_list[0]].fileName,
120
+ uid: detail[list[0]].fileName,
121
121
  name: file.name,
122
122
  size: file.size,
123
- fileId: _detail[_list[0]].fileName,
124
- stype: _detail[_list[0]].fileExt,
123
+ fileId: detail[list[0]].fileName,
124
+ stype: detail[list[0]].fileExt,
125
125
  username: currentUser && currentUser.sname,
126
126
  uploadDate: moment().valueOf(),
127
- previewUrl: _detail[_list[0]].previewUrl
127
+ previewUrl: detail[list[0]].previewUrl
128
128
  };
129
129
  gridRef.current.changeData(null, data);
130
130
  }
@@ -157,17 +157,19 @@ var UploadGridForm = function UploadGridForm(_ref) {
157
157
  data: formData
158
158
  }).then(function (res) {
159
159
  var code = res.code,
160
- content = res.content;
160
+ list = res.list,
161
+ detail = res.detail,
162
+ msg = res.msg;
161
163
  if (code === 1) {
162
164
  setUploadLoading(false);
163
165
  setVisible(false);
164
- content.forEach(function (file, index) {
166
+ list.forEach(function (i, index) {
165
167
  var data = {
166
- uid: detail[list[0]].fileName,
167
- name: values.files[index].name,
168
- size: values.files[index].size,
169
- stype: file.fileExt,
170
- fileId: detail[list[0]].fileName,
168
+ uid: detail[i].fileName,
169
+ name: detail[i].origFileName,
170
+ size: detail[i].fileSize,
171
+ stype: detail[i].fileExt,
172
+ fileId: detail[i].fileName,
171
173
  username: currentUser && currentUser.sname,
172
174
  note: snote,
173
175
  uploadDate: moment().valueOf(),
@@ -184,6 +186,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
184
186
  }, 300);
185
187
  }
186
188
  });
189
+ } else {
190
+ setUploadLoading(false);
191
+ showPop(msg, null, 'error');
187
192
  }
188
193
  });
189
194
  }
package/es/upload/Form/index.js CHANGED
@@ -55,7 +55,8 @@ function buildComponent(props) {
55
55
  stype: i.fileExt,
56
56
  username: i.sregnm,
57
57
  uploadDate: i.dregt,
58
- previewUrl: i.previewUrl
58
+ previewUrl: i.previewUrl,
59
+ note: i.note
59
60
  };
60
61
  });
61
62
  }
package/es/utils/grid.js CHANGED
@@ -126,7 +126,7 @@ export var getGridColumn = function getGridColumn() {
126
126
  filter = _merge.filter,
127
127
  filterParams = _merge.filterParams,
128
128
  _props = _objectWithoutProperties(_merge, _excluded3);
129
- var _extra = JSON.parse(extra);
129
+ var _extra = JSON.parse(extra) || {};
130
130
  var data = _objectSpread(_objectSpread({}, _props), {}, {
131
131
  field: name,
132
132
  title: _props.label,
@@ -235,6 +235,8 @@ export var getGridColumn = function getGridColumn() {
235
235
  };
236
236
  break;
237
237
  case 'upload':
238
+ case 'textarea':
239
+ case 'editor':
238
240
  data.filter = false;
239
241
  break;
240
242
  default:
package/lib/upload/Form/gridForm.js CHANGED
@@ -122,17 +122,17 @@ var UploadGridForm = function UploadGridForm(_ref) {
122
122
  }
123
123
  if (file.status === 'done' && file.response && file.response.code === 1) {
124
124
  var _file$response2 = file.response,
125
- _list = _file$response2.list,
126
- _detail = _file$response2.detail;
125
+ list = _file$response2.list,
126
+ detail = _file$response2.detail;
127
127
  var data = {
128
- uid: _detail[_list[0]].fileName,
128
+ uid: detail[list[0]].fileName,
129
129
  name: file.name,
130
130
  size: file.size,
131
- fileId: _detail[_list[0]].fileName,
132
- stype: _detail[_list[0]].fileExt,
131
+ fileId: detail[list[0]].fileName,
132
+ stype: detail[list[0]].fileExt,
133
133
  username: currentUser && currentUser.sname,
134
134
  uploadDate: (0, _moment.default)().valueOf(),
135
- previewUrl: _detail[_list[0]].previewUrl
135
+ previewUrl: detail[list[0]].previewUrl
136
136
  };
137
137
  gridRef.current.changeData(null, data);
138
138
  }
@@ -165,17 +165,19 @@ var UploadGridForm = function UploadGridForm(_ref) {
165
165
  data: formData
166
166
  }).then(function (res) {
167
167
  var code = res.code,
168
- content = res.content;
168
+ list = res.list,
169
+ detail = res.detail,
170
+ msg = res.msg;
169
171
  if (code === 1) {
170
172
  setUploadLoading(false);
171
173
  setVisible(false);
172
- content.forEach(function (file, index) {
174
+ list.forEach(function (i, index) {
173
175
  var data = {
174
- uid: detail[list[0]].fileName,
175
- name: values.files[index].name,
176
- size: values.files[index].size,
177
- stype: file.fileExt,
178
- fileId: detail[list[0]].fileName,
176
+ uid: detail[i].fileName,
177
+ name: detail[i].origFileName,
178
+ size: detail[i].fileSize,
179
+ stype: detail[i].fileExt,
180
+ fileId: detail[i].fileName,
179
181
  username: currentUser && currentUser.sname,
180
182
  note: snote,
181
183
  uploadDate: (0, _moment.default)().valueOf(),
@@ -192,6 +194,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
192
194
  }, 300);
193
195
  }
194
196
  });
197
+ } else {
198
+ setUploadLoading(false);
199
+ (0, _utils.showPop)(msg, null, 'error');
195
200
  }
196
201
  });
197
202
  }
package/lib/upload/Form/index.js CHANGED
@@ -62,7 +62,8 @@ function buildComponent(props) {
62
62
  stype: i.fileExt,
63
63
  username: i.sregnm,
64
64
  uploadDate: i.dregt,
65
- previewUrl: i.previewUrl
65
+ previewUrl: i.previewUrl,
66
+ note: i.note
66
67
  };
67
68
  });
68
69
  }
package/lib/utils/grid.js CHANGED
@@ -134,7 +134,7 @@ var getGridColumn = function getGridColumn() {
134
134
  filter = _merge.filter,
135
135
  filterParams = _merge.filterParams,
136
136
  _props = (0, _objectWithoutProperties2.default)(_merge, _excluded3);
137
- var _extra = JSON.parse(extra);
137
+ var _extra = JSON.parse(extra) || {};
138
138
  var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
139
139
  field: name,
140
140
  title: _props.label,
@@ -243,6 +243,8 @@ var getGridColumn = function getGridColumn() {
243
243
  };
244
244
  break;
245
245
  case 'upload':
246
+ case 'textarea':
247
+ case 'editor':
246
248
  data.filter = false;
247
249
  break;
248
250
  default:
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "0.0.21-UI-1",
3
+ "version": "0.0.22-1",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -42,6 +42,7 @@
42
42
  "dependencies": {
43
43
  "@babel/runtime": "^7.18.9",
44
44
  "ahooks": "^3.7.0",
45
+ "antd": "^3.26.6",
45
46
  "classnames": "^2.3.1",
46
47
  "lodash": "^4.17.11",
47
48
  "moment": "^2.24.0",