@luck-design-biz/luckda 0.0.12-6 → 0.0.12-8

package/es/components/LdAutoForm/index.js

@@ -62,7 +62,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           formId: ldId,
           moduleCode: moduleCode,
           formRef: formRef,
-          formMode: formMode
+          formMode: formMode,
+          uid: ticketData[window.appConfig.constraintKeys.PRIMARY]
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange(_defineProperty({}, ldId, _defineProperty({}, col.field, value)));
@@ -77,7 +78,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }, i.props);
     })));
     return _nodes;
-  }, [columns, filedsRewrite, isMain]);
+  }, [columns, filedsRewrite, isMain, formMode]);
   var formConfig = {
     formId: ldId,
     isMain: isMain,

package/es/components/LdFormList/index.js

@@ -92,7 +92,8 @@ var LdFormList = function LdFormList(_ref) {
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref6.formCode,
-      formKey = _ref6.formKey;
+      formKey = _ref6.formKey,
+      formUid = _ref6.formUid;
     setSubmitLoading(true);
     onBatchSubmitAction({
       values: values,
@@ -103,7 +104,9 @@ var LdFormList = function LdFormList(_ref) {
       action: action,
       formData: props.formData,
       form_id: formKey,
-      effcode: formCode
+      effcode: formCode,
+      formUid: formUid,
+      mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
       setSubmitLoading(false);
       if (success) {
@@ -143,6 +146,7 @@ var LdFormList = function LdFormList(_ref) {
     readOnly: readOnly,
     mainFormLdId: mainFormLdId,
     onValueChange: handleValueChange,
+    formRef: formListRef,
     renderExtra: renderExtra
   });
   var formList = renderFormList(formConfig);

package/es/helper/FromItems.js

@@ -24,7 +24,7 @@ var _excluded = ["onBlur"],
   _excluded20 = ["handleValueChange", "config"],
   _excluded21 = ["onBlur"],
   _excluded22 = ["handleValueChange", "config"],
-  _excluded23 = ["onBlur"],
+  _excluded23 = ["onBlur", "uid"],
   _excluded24 = ["handleValueChange", "config"];
 import React, { useState, useEffect } from 'react';
 import { getDvaApp } from 'umi';
@@ -298,9 +298,11 @@ export var getUploadItem = function getUploadItem() {
     _ref14$config = _ref14.config,
     _ref14$config2 = _ref14$config === void 0 ? {} : _ref14$config,
     _onBlur5 = _ref14$config2.onBlur,
+    uid = _ref14$config2.uid,
     _config = _objectWithoutProperties(_ref14$config2, _excluded23),
     props = _objectWithoutProperties(_ref14, _excluded24);
   return /*#__PURE__*/React.createElement(UploadFormItemV3, _extends({}, props, {
+    docUid: props.uid,
     config: _objectSpread(_objectSpread({
       listType: 'picture-card',
       accept: 'image/*'

package/es/helper/action.js

@@ -108,7 +108,9 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
     action = _ref3.action,
     formData = _ref3.formData,
     form_id = _ref3.form_id,
-    effcode = _ref3.effcode;
+    effcode = _ref3.effcode,
+    formUid = _ref3.formUid,
+    mainDataSetKey = _ref3.mainDataSetKey;
   var data = transform(formList, function (result, value) {
     var _values$value$id;
     if (values[value.id]) {
@@ -116,7 +118,7 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
       switch (value.type) {
         case 'auto':
           result[_dataSetKey] = _objectSpread({
-            indocno: formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
+            indocno: mainDataSetKey === _dataSetKey && action === 'add' && !window.appConfig.suppressUid ? formUid : formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
           }, dataFormat(dataSets[_dataSetKey], (_values$value$id = values[value.id]) === null || _values$value$id === void 0 ? void 0 : _values$value$id.submitData));
           break;
         case 'grid':

package/es/utils/form.js

@@ -12,7 +12,7 @@ var _excluded = ["comName", "property"],
   _excluded9 = ["type", "name"];
 import React from 'react';
 import moment from 'moment';
-import { capitalize, merge, transform, isArray, omit, isNil } from 'lodash';
+import { capitalize, merge, transform, isArray, omit, isNil, clone } from 'lodash';
 import { defaultComName, translator, splitStrToObj, formatCustomProps } from '../helper/form';
 import { getColumnRender } from './grid';
 import * as formItemUtils from '../helper/FromItems';
@@ -121,10 +121,11 @@ export var formItemDataFormat = function formItemDataFormat() {
  */
 export var dataFormat = function dataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   // 姚小川说：冗余字段后端处理，不需要前端传给后端
+  var values = clone(_values);
   var data = transform(propsList, function (result, n) {
-    var _values$name3, _values$name4;
+    var _values$name3, _values$name4, _values$name$;
     var _ref3 = n || {},
       comName = _ref3.comName,
       property = _ref3.property,
@@ -132,6 +133,15 @@ export var dataFormat = function dataFormat() {
     var translatorProps = translator(props);
     var name = translatorProps.name;
     if (!values.hasOwnProperty(name)) return;
+    // if (!values.hasOwnProperty(name)) {
+    //   if (isNil(props.defaultValue)) return;
+    //   console.log('props.defaultValue',props.defaultValue);
+    //   values[name] = props.defaultValue;
+    //   values[`${name}_virtual`] = props.defaultValueVirtual;
+    // };
+    // if(!isNil(props.defaultValue)){
+
+    // }
     switch (comName || defaultComName[property]) {
       case 'date':
         result[name] = values[name] ? moment(values[name]).valueOf() : null;
@@ -152,6 +162,9 @@ export var dataFormat = function dataFormat() {
       case 'year':
         result[name] = values[name] ? moment(values[name]).format('YYYY') : null;
         break;
+      case 'upload':
+        result[name] = values[name] && values[name][0] ? (_values$name$ = values[name][0]) === null || _values$name$ === void 0 ? void 0 : _values$name$.name : null;
+        break;
       default:
         result[name] = values[name];
     }

package/lib/components/LdAutoForm/index.js

@@ -70,7 +70,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
           formId: ldId,
           moduleCode: moduleCode,
           formRef: formRef,
-          formMode: formMode
+          formMode: formMode,
+          uid: ticketData[window.appConfig.constraintKeys.PRIMARY]
         }, customFiled), {}, {
           handleValueChange: function handleValueChange(value) {
             return onValueChange((0, _defineProperty2.default)({}, ldId, (0, _defineProperty2.default)({}, col.field, value)));
@@ -85,7 +86,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
       }, i.props);
     })));
     return _nodes;
-  }, [columns, filedsRewrite, isMain]);
+  }, [columns, filedsRewrite, isMain, formMode]);
   var formConfig = {
     formId: ldId,
     isMain: isMain,

package/lib/components/LdFormList/index.js

@@ -99,7 +99,8 @@ var LdFormList = function LdFormList(_ref) {
   var handleBatchSubmit = function handleBatchSubmit(values, action) {
     var _ref6 = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
       formCode = _ref6.formCode,
-      formKey = _ref6.formKey;
+      formKey = _ref6.formKey,
+      formUid = _ref6.formUid;
     setSubmitLoading(true);
     (0, _action.onBatchSubmitAction)({
       values: values,
@@ -110,7 +111,9 @@ var LdFormList = function LdFormList(_ref) {
       action: action,
       formData: props.formData,
       form_id: formKey,
-      effcode: formCode
+      effcode: formCode,
+      formUid: formUid,
+      mainDataSetKey: mainDataSetKey
     }, function (success, mainKey, res) {
       setSubmitLoading(false);
       if (success) {
@@ -150,6 +153,7 @@ var LdFormList = function LdFormList(_ref) {
     readOnly: readOnly,
     mainFormLdId: mainFormLdId,
     onValueChange: handleValueChange,
+    formRef: formListRef,
     renderExtra: renderExtra
   });
   var formList = renderFormList(formConfig);

package/lib/helper/FromItems.js

@@ -37,7 +37,7 @@ var _excluded = ["onBlur"],
   _excluded20 = ["handleValueChange", "config"],
   _excluded21 = ["onBlur"],
   _excluded22 = ["handleValueChange", "config"],
-  _excluded23 = ["onBlur"],
+  _excluded23 = ["onBlur", "uid"],
   _excluded24 = ["handleValueChange", "config"];
 var getNumberItem = function getNumberItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
@@ -319,9 +319,11 @@ var getUploadItem = function getUploadItem() {
     _ref14$config = _ref14.config,
     _ref14$config2 = _ref14$config === void 0 ? {} : _ref14$config,
     _onBlur5 = _ref14$config2.onBlur,
+    uid = _ref14$config2.uid,
     _config = (0, _objectWithoutProperties2.default)(_ref14$config2, _excluded23),
     props = (0, _objectWithoutProperties2.default)(_ref14, _excluded24);
   return /*#__PURE__*/_react.default.createElement(_base.UploadFormItemV3, (0, _extends2.default)({}, props, {
+    docUid: props.uid,
     config: (0, _objectSpread2.default)((0, _objectSpread2.default)({
       listType: 'picture-card',
       accept: 'image/*'

package/lib/helper/action.js

@@ -116,7 +116,9 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
     action = _ref3.action,
     formData = _ref3.formData,
     form_id = _ref3.form_id,
-    effcode = _ref3.effcode;
+    effcode = _ref3.effcode,
+    formUid = _ref3.formUid,
+    mainDataSetKey = _ref3.mainDataSetKey;
   var data = (0, _lodash.transform)(formList, function (result, value) {
     var _values$value$id;
     if (values[value.id]) {
@@ -124,7 +126,7 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
       switch (value.type) {
         case 'auto':
           result[_dataSetKey] = (0, _objectSpread4.default)({
-            indocno: formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
+            indocno: mainDataSetKey === _dataSetKey && action === 'add' && !window.appConfig.suppressUid ? formUid : formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
           }, (0, _utils2.dataFormat)(dataSets[_dataSetKey], (_values$value$id = values[value.id]) === null || _values$value$id === void 0 ? void 0 : _values$value$id.submitData));
           break;
         case 'grid':

package/lib/utils/form.js

@@ -130,10 +130,11 @@ var formItemDataFormat = function formItemDataFormat() {
 exports.formItemDataFormat = formItemDataFormat;
 var dataFormat = function dataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   // 姚小川说：冗余字段后端处理，不需要前端传给后端
+  var values = (0, _lodash.clone)(_values);
   var data = (0, _lodash.transform)(propsList, function (result, n) {
-    var _values$name3, _values$name4;
+    var _values$name3, _values$name4, _values$name$;
     var _ref3 = n || {},
       comName = _ref3.comName,
       property = _ref3.property,
@@ -141,6 +142,15 @@ var dataFormat = function dataFormat() {
     var translatorProps = (0, _form.translator)(props);
     var name = translatorProps.name;
     if (!values.hasOwnProperty(name)) return;
+    // if (!values.hasOwnProperty(name)) {
+    //   if (isNil(props.defaultValue)) return;
+    //   console.log('props.defaultValue',props.defaultValue);
+    //   values[name] = props.defaultValue;
+    //   values[`${name}_virtual`] = props.defaultValueVirtual;
+    // };
+    // if(!isNil(props.defaultValue)){
+
+    // }
     switch (comName || _form.defaultComName[property]) {
       case 'date':
         result[name] = values[name] ? (0, _moment.default)(values[name]).valueOf() : null;
@@ -161,6 +171,9 @@ var dataFormat = function dataFormat() {
       case 'year':
         result[name] = values[name] ? (0, _moment.default)(values[name]).format('YYYY') : null;
         break;
+      case 'upload':
+        result[name] = values[name] && values[name][0] ? (_values$name$ = values[name][0]) === null || _values$name$ === void 0 ? void 0 : _values$name$.name : null;
+        break;
       default:
         result[name] = values[name];
     }

package/package.json

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