@luck-design-biz/luckda 0.0.16-1 → 0.0.16-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 (9) hide show
  1. package/es/helper/action.js +1 -1
  2. package/es/upload/Form/gridForm.js +11 -7
  3. package/es/upload/Form/index.js +14 -7
  4. package/es/utils/grid.js +1 -1
  5. package/lib/helper/action.js +1 -1
  6. package/lib/upload/Form/gridForm.js +11 -7
  7. package/lib/upload/Form/index.js +14 -7
  8. package/lib/utils/grid.js +1 -1
  9. package/package.json +1 -1
package/es/helper/action.js CHANGED
@@ -158,7 +158,7 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
158
158
  } else {
159
159
  result[formInfo.dataSetKey] = transform(value, function (_result, _value, _key) {
160
160
  _result[_key] = _value.map(function (_val) {
161
- return _objectSpread(_objectSpread({}, dataFormat(gridColumns, _val)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
161
+ return _objectSpread(_objectSpread({}, dataFormat(gridColumns, _val)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : _val[window.appConfig.constraintKeys.PRIMARY]));
162
162
  });
163
163
  }, {});
164
164
  }
package/es/upload/Form/gridForm.js CHANGED
@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
2
2
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
3
3
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
4
4
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
5
- var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl"];
6
- import React, { useState, useRef } from 'react';
5
+ var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
6
+ import React, { useState, useRef, forwardRef } from 'react';
7
7
  import { getDvaApp } from 'umi';
8
8
  import { useMemoizedFn } from 'ahooks';
9
9
  import { Button, Upload, Tooltip, Icon } from 'antd';
@@ -64,6 +64,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
64
64
  zipName = _ref$zipName === void 0 ? 'download.zip' : _ref$zipName,
65
65
  resetActions = _ref.resetActions,
66
66
  getUrl = _ref.getUrl,
67
+ wrapperRef = _ref.wrapperRef,
67
68
  rest = _objectWithoutProperties(_ref, _excluded);
68
69
  var _useState = useState(false),
69
70
  _useState2 = _slicedToArray(_useState, 2),
@@ -73,7 +74,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
73
74
  _useState4 = _slicedToArray(_useState3, 2),
74
75
  uploadLoading = _useState4[0],
75
76
  setUploadLoading = _useState4[1];
76
- var gridRef = useRef(null);
77
+ var gridRef = wrapperRef || useRef(null);
77
78
  var _getDvaApp$_store$get = (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
78
79
  currentUser = _getDvaApp$_store$get.currentUser;
79
80
 
@@ -86,7 +87,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
86
87
  var filenames = selectedRows.map(function (item) {
87
88
  return item.fileId || item.uid;
88
89
  });
89
- console.log('handleDownload1', filenames, selectedRows);
90
90
  downloadFile(filenames, 'downloadOne');
91
91
  cb && cb(true);
92
92
  } else {
@@ -94,7 +94,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
94
94
  var files = selectedRows.map(function (item) {
95
95
  return item.fileId || item.uid;
96
96
  }).join(',');
97
- console.log('handleDownload2', files, selectedRows);
98
97
  patchDownloadZip(getUrl('downloadZip'), files, {
99
98
  zipName: zipName
100
99
  }).then(function () {
@@ -372,5 +371,10 @@ var UploadGridForm = function UploadGridForm(_ref) {
372
371
  }
373
372
  }))));
374
373
  };
375
- UploadGridForm.displayName = 'GridForm';
376
- export default UploadGridForm;
374
+ var Com = /*#__PURE__*/forwardRef(function (props, ref) {
375
+ return /*#__PURE__*/React.createElement(UploadGridForm, _extends({
376
+ wrapperRef: ref
377
+ }, props));
378
+ });
379
+ export default Com;
380
+ Com.displayName = 'GridForm';
package/es/upload/Form/index.js CHANGED
@@ -15,10 +15,11 @@ function buildComponent(props) {
15
15
  note = _props$note === void 0 ? '' : _props$note,
16
16
  rest = _objectWithoutProperties(props, _excluded);
17
17
  var formId = "annex_".concat(_formId);
18
- var getUrl = function getUrl(behaviorKey, _note) {
19
- var formData = rest.formData,
20
- mainFormLdId = rest.mainFormLdId,
21
- ticketData = rest.ticketData;
18
+ var getUrl = function getUrl(behaviorKey, _note, docUid) {
19
+ var ticketData = rest.ticketData,
20
+ formData = rest.formData,
21
+ mainFormLdId = rest.mainFormLdId;
22
+ var PRIMARY_KEY = window.appConfig.constraintKeys.PRIMARY;
22
23
  var params = omitBy({
23
24
  moduleCode: moduleCode,
24
25
  bucket: bucket,
@@ -26,7 +27,7 @@ function buildComponent(props) {
26
27
  tag: formId,
27
28
  note: _note || note,
28
29
  active: !(behaviorKey === 'loadFileGrid' || rest.formMode === 'add' || rest.formMode === 'update'),
29
- docUid: formData && formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData && ticketData[window.appConfig.constraintKeys.PRIMARY]
30
+ docUid: docUid || formData[mainFormLdId] && formData[mainFormLdId][PRIMARY_KEY] || ticketData && ticketData[PRIMARY_KEY]
30
31
  }, isNil);
31
32
  return "".concat(window.appConfig.OSS_HOST_V3, "?").concat(stringify(params));
32
33
  };
@@ -36,8 +37,14 @@ function buildComponent(props) {
36
37
  rowKey: "uid"
37
38
  }, rest, {
38
39
  onQuery: {
39
- api: function api() {
40
- return request(getUrl('loadFileGrid'));
40
+ api: function api(_ref) {
41
+ var docUid = _ref.docUid;
42
+ return request(getUrl('loadFileGrid', null, docUid));
43
+ },
44
+ get: function get(formData) {
45
+ return {
46
+ docUid: formData && formData[rest.mainFormLdId] && formData[rest.mainFormLdId][window.appConfig.constraintKeys.PRIMARY]
47
+ };
41
48
  },
42
49
  format: function format(data) {
43
50
  return data.map(function (i) {
package/es/utils/grid.js CHANGED
@@ -81,7 +81,7 @@ export function getColumnRender(name, type) {
81
81
  name: file.origFileName,
82
82
  previewUrl: "".concat(api.LUCKDA_HOST).concat(file.previewUrl)
83
83
  };
84
- });
84
+ }); // 过滤删除文件
85
85
  return /*#__PURE__*/React.createElement(UploadGridCell, {
86
86
  fileList: fileList
87
87
  });
package/lib/helper/action.js CHANGED
@@ -166,7 +166,7 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
166
166
  } else {
167
167
  result[formInfo.dataSetKey] = (0, _lodash.transform)(value, function (_result, _value, _key) {
168
168
  _result[_key] = _value.map(function (_val) {
169
- return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, _val)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
169
+ return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, _val)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : _val[window.appConfig.constraintKeys.PRIMARY]));
170
170
  });
171
171
  }, {});
172
172
  }
package/lib/upload/Form/gridForm.js CHANGED
@@ -20,7 +20,7 @@ var _luckDesign = require("luck-design");
20
20
  var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
21
21
  var _FormList = require("@luck-design-biz/base/FormList");
22
22
  var _utils = require("@luck-design-biz/base/utils");
23
- var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl"];
23
+ var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
24
24
  var columns = [{
25
25
  field: 'name',
26
26
  title: '附件名称'
@@ -72,6 +72,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
72
72
  zipName = _ref$zipName === void 0 ? 'download.zip' : _ref$zipName,
73
73
  resetActions = _ref.resetActions,
74
74
  getUrl = _ref.getUrl,
75
+ wrapperRef = _ref.wrapperRef,
75
76
  rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
76
77
  var _useState = (0, _react.useState)(false),
77
78
  _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -81,7 +82,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
81
82
  _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
82
83
  uploadLoading = _useState4[0],
83
84
  setUploadLoading = _useState4[1];
84
- var gridRef = (0, _react.useRef)(null);
85
+ var gridRef = wrapperRef || (0, _react.useRef)(null);
85
86
  var _getDvaApp$_store$get = (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
86
87
  currentUser = _getDvaApp$_store$get.currentUser;
87
88
 
@@ -94,7 +95,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
94
95
  var filenames = selectedRows.map(function (item) {
95
96
  return item.fileId || item.uid;
96
97
  });
97
- console.log('handleDownload1', filenames, selectedRows);
98
98
  downloadFile(filenames, 'downloadOne');
99
99
  cb && cb(true);
100
100
  } else {
@@ -102,7 +102,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
102
102
  var files = selectedRows.map(function (item) {
103
103
  return item.fileId || item.uid;
104
104
  }).join(',');
105
- console.log('handleDownload2', files, selectedRows);
106
105
  (0, _utils.patchDownloadZip)(getUrl('downloadZip'), files, {
107
106
  zipName: zipName
108
107
  }).then(function () {
@@ -380,6 +379,11 @@ var UploadGridForm = function UploadGridForm(_ref) {
380
379
  }
381
380
  }))));
382
381
  };
383
- UploadGridForm.displayName = 'GridForm';
384
- var _default = UploadGridForm;
385
- exports.default = _default;
382
+ var Com = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
383
+ return /*#__PURE__*/_react.default.createElement(UploadGridForm, (0, _extends2.default)({
384
+ wrapperRef: ref
385
+ }, props));
386
+ });
387
+ var _default = Com;
388
+ exports.default = _default;
389
+ Com.displayName = 'GridForm';
package/lib/upload/Form/index.js CHANGED
@@ -22,10 +22,11 @@ function buildComponent(props) {
22
22
  note = _props$note === void 0 ? '' : _props$note,
23
23
  rest = (0, _objectWithoutProperties2.default)(props, _excluded);
24
24
  var formId = "annex_".concat(_formId);
25
- var getUrl = function getUrl(behaviorKey, _note) {
26
- var formData = rest.formData,
27
- mainFormLdId = rest.mainFormLdId,
28
- ticketData = rest.ticketData;
25
+ var getUrl = function getUrl(behaviorKey, _note, docUid) {
26
+ var ticketData = rest.ticketData,
27
+ formData = rest.formData,
28
+ mainFormLdId = rest.mainFormLdId;
29
+ var PRIMARY_KEY = window.appConfig.constraintKeys.PRIMARY;
29
30
  var params = (0, _lodash.omitBy)({
30
31
  moduleCode: moduleCode,
31
32
  bucket: bucket,
@@ -33,7 +34,7 @@ function buildComponent(props) {
33
34
  tag: formId,
34
35
  note: _note || note,
35
36
  active: !(behaviorKey === 'loadFileGrid' || rest.formMode === 'add' || rest.formMode === 'update'),
36
- docUid: formData && formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData && ticketData[window.appConfig.constraintKeys.PRIMARY]
37
+ docUid: docUid || formData[mainFormLdId] && formData[mainFormLdId][PRIMARY_KEY] || ticketData && ticketData[PRIMARY_KEY]
37
38
  }, _lodash.isNil);
38
39
  return "".concat(window.appConfig.OSS_HOST_V3, "?").concat((0, _querystring.stringify)(params));
39
40
  };
@@ -43,8 +44,14 @@ function buildComponent(props) {
43
44
  rowKey: "uid"
44
45
  }, rest, {
45
46
  onQuery: {
46
- api: function api() {
47
- return (0, _utils.request)(getUrl('loadFileGrid'));
47
+ api: function api(_ref) {
48
+ var docUid = _ref.docUid;
49
+ return (0, _utils.request)(getUrl('loadFileGrid', null, docUid));
50
+ },
51
+ get: function get(formData) {
52
+ return {
53
+ docUid: formData && formData[rest.mainFormLdId] && formData[rest.mainFormLdId][window.appConfig.constraintKeys.PRIMARY]
54
+ };
48
55
  },
49
56
  format: function format(data) {
50
57
  return data.map(function (i) {
package/lib/utils/grid.js CHANGED
@@ -88,7 +88,7 @@ function getColumnRender(name, type) {
88
88
  name: file.origFileName,
89
89
  previewUrl: "".concat(_ApiConfig.default.LUCKDA_HOST).concat(file.previewUrl)
90
90
  };
91
- });
91
+ }); // 过滤删除文件
92
92
  return /*#__PURE__*/_react.default.createElement(_GridCell.default, {
93
93
  fileList: fileList
94
94
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "0.0.16-1",
3
+ "version": "0.0.16-10",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",