@luck-design-biz/luckda 0.0.16 → 0.0.17

package/es/components/LdFormList/index.js

@@ -6,7 +6,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -53,6 +53,8 @@ var LdFormList = function LdFormList(_ref) {
     renderFormExtra = _ref$renderFormExtra === void 0 ? function () {
       return /*#__PURE__*/React.createElement(React.Fragment, null);
     } : _ref$renderFormExtra,
+    _ref$bpmButtonProps = _ref.bpmButtonProps,
+    bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -110,10 +112,10 @@ var LdFormList = function LdFormList(_ref) {
 
   /**zss添加**/
   var renderAffixRightCustom = function renderAffixRightCustom() {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/React.createElement(BpmButton, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/React.createElement(BpmButton, _extends({
       bizData: bizData,
       suppressDept: false
-    }));
+    }, bpmButtonProps)));
   };
   useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _props$ticketData, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
@@ -149,7 +151,7 @@ var LdFormList = function LdFormList(_ref) {
           data = _yield$readBehaviorCa.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
-            tempObj = {
+            tempObj = _objectSpread(_objectSpread({}, props.formData[mainFormLdId]), {}, {
               bizKey: bpmInfoObj.bizKey,
               sname: bpmInfoObj.name,
               modelKey: bpmInfoObj.bpmKey,
@@ -157,7 +159,7 @@ var LdFormList = function LdFormList(_ref) {
               moduleCode: rest.moduleCode,
               datasetCode: mainDataSetKey,
               indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
-            };
+            });
             setBizData(tempObj);
             setIsCustomRenderAffixRight(true);
           }
@@ -166,7 +168,7 @@ var LdFormList = function LdFormList(_ref) {
           return _context.stop();
       }
     }, _callee);
-  })), []);
+  })), [props.formData]);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref7.formCode,

package/es/helper/action.js

@@ -158,7 +158,7 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
         } else {
           result[formInfo.dataSetKey] = transform(value, function (_result, _value, _key) {
             _result[_key] = _value.map(function (_val) {
-              return _objectSpread(_objectSpread({}, dataFormat(gridColumns, _val)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
+              return _objectSpread(_objectSpread({}, dataFormat(gridColumns, _val)), {}, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : _val[window.appConfig.constraintKeys.PRIMARY]));
             });
           }, {});
         }

package/es/helper/form.js

@@ -86,6 +86,7 @@ export function translator() {
       label: '不满足验证要求'
     })
   }];
+  if (allConfig['desensitized']) _props.desensitized = allConfig['desensitized']; // 脱敏
   return _props;
 }
 

package/es/upload/Form/gridForm.js

@@ -2,8 +2,8 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl"];
-import React, { useState, useRef } from 'react';
+var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
+import React, { useState, useRef, forwardRef } from 'react';
 import { getDvaApp } from 'umi';
 import { useMemoizedFn } from 'ahooks';
 import { Button, Upload, Tooltip, Icon } from 'antd';
@@ -64,6 +64,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     zipName = _ref$zipName === void 0 ? 'download.zip' : _ref$zipName,
     resetActions = _ref.resetActions,
     getUrl = _ref.getUrl,
+    wrapperRef = _ref.wrapperRef,
     rest = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
@@ -73,7 +74,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     uploadLoading = _useState4[0],
     setUploadLoading = _useState4[1];
-  var gridRef = useRef(null);
+  var gridRef = wrapperRef || useRef(null);
   var _getDvaApp$_store$get = (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
 
@@ -86,7 +87,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
       var filenames = selectedRows.map(function (item) {
         return item.fileId || item.uid;
       });
-      console.log('handleDownload1', filenames, selectedRows);
       downloadFile(filenames, 'downloadOne');
       cb && cb(true);
     } else {
@@ -94,7 +94,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
       var files = selectedRows.map(function (item) {
         return item.fileId || item.uid;
       }).join(',');
-      console.log('handleDownload2', files, selectedRows);
       patchDownloadZip(getUrl('downloadZip'), files, {
         zipName: zipName
       }).then(function () {
@@ -372,5 +371,10 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
   }))));
 };
-UploadGridForm.displayName = 'GridForm';
-export default UploadGridForm;
+var Com = /*#__PURE__*/forwardRef(function (props, ref) {
+  return /*#__PURE__*/React.createElement(UploadGridForm, _extends({
+    wrapperRef: ref
+  }, props));
+});
+export default Com;
+Com.displayName = 'GridForm';

package/es/upload/Form/index.js

@@ -15,10 +15,11 @@ function buildComponent(props) {
     note = _props$note === void 0 ? '' : _props$note,
     rest = _objectWithoutProperties(props, _excluded);
   var formId = "annex_".concat(_formId);
-  var getUrl = function getUrl(behaviorKey, _note) {
-    var formData = rest.formData,
-      mainFormLdId = rest.mainFormLdId,
-      ticketData = rest.ticketData;
+  var getUrl = function getUrl(behaviorKey, _note, docUid) {
+    var ticketData = rest.ticketData,
+      formData = rest.formData,
+      mainFormLdId = rest.mainFormLdId;
+    var PRIMARY_KEY = window.appConfig.constraintKeys.PRIMARY;
     var params = omitBy({
       moduleCode: moduleCode,
       bucket: bucket,
@@ -26,7 +27,7 @@ function buildComponent(props) {
       tag: formId,
       note: _note || note,
       active: !(behaviorKey === 'loadFileGrid' || rest.formMode === 'add' || rest.formMode === 'update'),
-      docUid: formData && formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData && ticketData[window.appConfig.constraintKeys.PRIMARY]
+      docUid: docUid || formData[mainFormLdId] && formData[mainFormLdId][PRIMARY_KEY] || ticketData && ticketData[PRIMARY_KEY]
     }, isNil);
     return "".concat(window.appConfig.OSS_HOST_V3, "?").concat(stringify(params));
   };
@@ -36,8 +37,14 @@ function buildComponent(props) {
     rowKey: "uid"
   }, rest, {
     onQuery: {
-      api: function api() {
-        return request(getUrl('loadFileGrid'));
+      api: function api(_ref) {
+        var docUid = _ref.docUid;
+        return request(getUrl('loadFileGrid', null, docUid));
+      },
+      get: function get(formData) {
+        return {
+          docUid: formData && formData[rest.mainFormLdId] && formData[rest.mainFormLdId][window.appConfig.constraintKeys.PRIMARY]
+        };
       },
       format: function format(data) {
         return data.map(function (i) {

package/es/utils/grid.js

@@ -8,7 +8,7 @@ import { getDvaApp } from 'umi';
 import { merge, isNil, isArray, includes } from 'lodash';
 import { Switch, Tag } from 'antd';
 import moment from 'moment';
-import { UploadGridCell } from '@luck-design-biz/base';
+import UploadGridCell from '../upload/GridCell';
 import { formatMessage } from '@luck-design-biz/base/utils';
 import api from '@/services/ApiConfig';
 import { defaultComName, translator, formatCustomProps } from '../helper/form';

package/lib/components/LdFormList/index.js

@@ -31,7 +31,7 @@ var _action = require("../../helper/action");
 var _lodash = require("lodash");
 var _bpm = require("@luck-design-biz/base/bpm");
 var _services = require("../../services");
-var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
+var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded4 = ["ldId", "initData", "overModel"];
@@ -60,6 +60,8 @@ var LdFormList = function LdFormList(_ref) {
     renderFormExtra = _ref$renderFormExtra === void 0 ? function () {
       return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
     } : _ref$renderFormExtra,
+    _ref$bpmButtonProps = _ref.bpmButtonProps,
+    bpmButtonProps = _ref$bpmButtonProps === void 0 ? {} : _ref$bpmButtonProps,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -117,10 +119,10 @@ var LdFormList = function LdFormList(_ref) {
 
   /**zss添加**/
   var renderAffixRightCustom = function renderAffixRightCustom() {
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/_react.default.createElement(_bpm.BpmButton, {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, renderAffixRight && renderAffixRight(), /*#__PURE__*/_react.default.createElement(_bpm.BpmButton, (0, _extends2.default)({
       bizData: bizData,
       suppressDept: false
-    }));
+    }, bpmButtonProps)));
   };
   (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     var _props$ticketData, _params, response, _yield$readBehaviorCa, code, data, _props$ticketData2, _props$ticketData3, bpmInfoObj, tempObj;
@@ -156,7 +158,7 @@ var LdFormList = function LdFormList(_ref) {
           data = _yield$readBehaviorCa.data;
           if (code == 1 && data) {
             bpmInfoObj = data.bpmInfo;
-            tempObj = {
+            tempObj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.formData[mainFormLdId]), {}, {
               bizKey: bpmInfoObj.bizKey,
               sname: bpmInfoObj.name,
               modelKey: bpmInfoObj.bpmKey,
@@ -164,7 +166,7 @@ var LdFormList = function LdFormList(_ref) {
               moduleCode: rest.moduleCode,
               datasetCode: mainDataSetKey,
               indocno: (_props$ticketData3 = props.ticketData) === null || _props$ticketData3 === void 0 ? void 0 : _props$ticketData3.indocno
-            };
+            });
             setBizData(tempObj);
             setIsCustomRenderAffixRight(true);
           }
@@ -173,7 +175,7 @@ var LdFormList = function LdFormList(_ref) {
           return _context.stop();
       }
     }, _callee);
-  })), []);
+  })), [props.formData]);
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref7 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref7.formCode,

package/lib/helper/action.js

@@ -166,7 +166,7 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
         } else {
           result[formInfo.dataSetKey] = (0, _lodash.transform)(value, function (_result, _value, _key) {
             _result[_key] = _value.map(function (_val) {
-              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]));
+              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]));
             });
           }, {});
         }

package/lib/helper/form.js

@@ -97,6 +97,7 @@ function translator() {
       label: '不满足验证要求'
     })
   }];
+  if (allConfig['desensitized']) _props.desensitized = allConfig['desensitized']; // 脱敏
   return _props;
 }
 

package/lib/upload/Form/gridForm.js

@@ -20,7 +20,7 @@ var _luckDesign = require("luck-design");
 var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var _FormList = require("@luck-design-biz/base/FormList");
 var _utils = require("@luck-design-biz/base/utils");
-var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl"];
+var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
 var columns = [{
   field: 'name',
   title: '附件名称'
@@ -72,6 +72,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     zipName = _ref$zipName === void 0 ? 'download.zip' : _ref$zipName,
     resetActions = _ref.resetActions,
     getUrl = _ref.getUrl,
+    wrapperRef = _ref.wrapperRef,
     rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -81,7 +82,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     uploadLoading = _useState4[0],
     setUploadLoading = _useState4[1];
-  var gridRef = (0, _react.useRef)(null);
+  var gridRef = wrapperRef || (0, _react.useRef)(null);
   var _getDvaApp$_store$get = (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
 
@@ -94,7 +95,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
       var filenames = selectedRows.map(function (item) {
         return item.fileId || item.uid;
       });
-      console.log('handleDownload1', filenames, selectedRows);
       downloadFile(filenames, 'downloadOne');
       cb && cb(true);
     } else {
@@ -102,7 +102,6 @@ var UploadGridForm = function UploadGridForm(_ref) {
       var files = selectedRows.map(function (item) {
         return item.fileId || item.uid;
       }).join(',');
-      console.log('handleDownload2', files, selectedRows);
       (0, _utils.patchDownloadZip)(getUrl('downloadZip'), files, {
         zipName: zipName
       }).then(function () {
@@ -380,6 +379,11 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
   }))));
 };
-UploadGridForm.displayName = 'GridForm';
-var _default = UploadGridForm;
-exports.default = _default;
+var Com = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  return /*#__PURE__*/_react.default.createElement(UploadGridForm, (0, _extends2.default)({
+    wrapperRef: ref
+  }, props));
+});
+var _default = Com;
+exports.default = _default;
+Com.displayName = 'GridForm';

package/lib/upload/Form/index.js

@@ -22,10 +22,11 @@ function buildComponent(props) {
     note = _props$note === void 0 ? '' : _props$note,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var formId = "annex_".concat(_formId);
-  var getUrl = function getUrl(behaviorKey, _note) {
-    var formData = rest.formData,
-      mainFormLdId = rest.mainFormLdId,
-      ticketData = rest.ticketData;
+  var getUrl = function getUrl(behaviorKey, _note, docUid) {
+    var ticketData = rest.ticketData,
+      formData = rest.formData,
+      mainFormLdId = rest.mainFormLdId;
+    var PRIMARY_KEY = window.appConfig.constraintKeys.PRIMARY;
     var params = (0, _lodash.omitBy)({
       moduleCode: moduleCode,
       bucket: bucket,
@@ -33,7 +34,7 @@ function buildComponent(props) {
       tag: formId,
       note: _note || note,
       active: !(behaviorKey === 'loadFileGrid' || rest.formMode === 'add' || rest.formMode === 'update'),
-      docUid: formData && formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData && ticketData[window.appConfig.constraintKeys.PRIMARY]
+      docUid: docUid || formData[mainFormLdId] && formData[mainFormLdId][PRIMARY_KEY] || ticketData && ticketData[PRIMARY_KEY]
     }, _lodash.isNil);
     return "".concat(window.appConfig.OSS_HOST_V3, "?").concat((0, _querystring.stringify)(params));
   };
@@ -43,8 +44,14 @@ function buildComponent(props) {
     rowKey: "uid"
   }, rest, {
     onQuery: {
-      api: function api() {
-        return (0, _utils.request)(getUrl('loadFileGrid'));
+      api: function api(_ref) {
+        var docUid = _ref.docUid;
+        return (0, _utils.request)(getUrl('loadFileGrid', null, docUid));
+      },
+      get: function get(formData) {
+        return {
+          docUid: formData && formData[rest.mainFormLdId] && formData[rest.mainFormLdId][window.appConfig.constraintKeys.PRIMARY]
+        };
       },
       format: function format(data) {
         return data.map(function (i) {

package/lib/utils/grid.js

@@ -13,7 +13,7 @@ var _umi = require("umi");
 var _lodash = require("lodash");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
-var _base = require("@luck-design-biz/base");
+var _GridCell = _interopRequireDefault(require("../upload/GridCell"));
 var _utils = require("@luck-design-biz/base/utils");
 var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var _form = require("../helper/form");
@@ -89,7 +89,7 @@ function getColumnRender(name, type) {
             previewUrl: "".concat(_ApiConfig.default.LUCKDA_HOST).concat(file.previewUrl)
           };
         });
-        return /*#__PURE__*/_react.default.createElement(_base.UploadGridCell, {
+        return /*#__PURE__*/_react.default.createElement(_GridCell.default, {
           fileList: fileList
         });
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",