@luck-design-biz/luckda 0.0.16-9 → 0.0.17

package/es/components/LdFormList/index.js

@@ -10,13 +10,13 @@ var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading"
   _excluded2 = ["dataSets", "doAction", "resources"],
   _excluded3 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
   _excluded4 = ["ldId", "initData", "overModel"];
-import React, { forwardRef, Fragment, useContext, useImperativeHandle, useRef, useState } from 'react';
+import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
 import { connect, getDvaApp, useRouteMatch } from 'umi';
 import PropTypes from 'prop-types';
-import { useAsyncEffect, useCreation, useMemoizedFn } from 'ahooks';
+import { useCreation, useMemoizedFn, useAsyncEffect } from 'ahooks';
 import { BasicDivider } from 'luck-design';
 import { ChildrenUtil } from '@luck-design-biz/base/utils';
-import { FormBtn, FormList, FormListAffix } from '@luck-design-biz/base/FormList';
+import { FormList, FormListAffix, FormBtn } from '@luck-design-biz/base/FormList';
 import buildLdAutoForm from '../LdAutoForm';
 import buildLdGridForm from '../LdGridForm';
 import { Collapse } from '@luck-design-biz/base';
@@ -24,7 +24,7 @@ import { LuckDaContext } from '../Builder';
 import { LuckDaPopContext } from '../LdPop';
 import createModel from './model';
 import { onBatchSubmitAction } from '../../helper/action';
-import { isArray, mapValues, sortBy } from 'lodash';
+import { isArray, sortBy, mapValues } from 'lodash';
 import { BpmButton } from '@luck-design-biz/base/bpm';
 import { readBehaviorCall } from '../../services';
 

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/index.js

@@ -16,7 +16,10 @@ function buildComponent(props) {
     rest = _objectWithoutProperties(props, _excluded);
   var formId = "annex_".concat(_formId);
   var getUrl = function getUrl(behaviorKey, _note, docUid) {
-    var ticketData = rest.ticketData;
+    var ticketData = rest.ticketData,
+      formData = rest.formData,
+      mainFormLdId = rest.mainFormLdId;
+    var PRIMARY_KEY = window.appConfig.constraintKeys.PRIMARY;
     var params = omitBy({
       moduleCode: moduleCode,
       bucket: bucket,
@@ -24,7 +27,7 @@ function buildComponent(props) {
       tag: formId,
       note: _note || note,
       active: !(behaviorKey === 'loadFileGrid' || rest.formMode === 'add' || rest.formMode === 'update'),
-      docUid: docUid || 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));
   };

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/index.js

@@ -23,7 +23,10 @@ function buildComponent(props) {
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var formId = "annex_".concat(_formId);
   var getUrl = function getUrl(behaviorKey, _note, docUid) {
-    var ticketData = rest.ticketData;
+    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,
@@ -31,7 +34,7 @@ function buildComponent(props) {
       tag: formId,
       note: _note || note,
       active: !(behaviorKey === 'loadFileGrid' || rest.formMode === 'add' || rest.formMode === 'update'),
-      docUid: docUid || 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));
   };

package/package.json

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