@luck-design-biz/luckda 0.0.12 → 0.0.13

package/lib/helper/action.js

@@ -5,7 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.onBatchSubmitAction = exports.doAction = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 var _utils = require("@luck-design-biz/base/utils");
@@ -62,14 +63,14 @@ var doAction = function doAction(action) {
       if (customAction) {
         customAction({
           api: _utils2.behaviorCall,
-          get: (0, _objectSpread2.default)({
+          get: (0, _objectSpread4.default)({
             behaviorKey: action,
             moduleCode: moduleCode
           }, get),
           post: post
         });
       } else {
-        (0, _utils2.behaviorCall)((0, _objectSpread2.default)({
+        (0, _utils2.behaviorCall)((0, _objectSpread4.default)({
           behaviorKey: action,
           moduleCode: moduleCode
         }, get), post).then(function (res) {
@@ -87,10 +88,14 @@ var doAction = function doAction(action) {
     };
     showConfirm ? makeSure(handleAction) : handleAction();
   } else {
-    (0, _utils.showPop)((0, _utils.formatMessage)({
-      id: 'luckda.operates.message.noAction',
-      label: '该模块下缺少此行为'
+    var errorMsg = "".concat((0, _utils.formatMessage)({
+      id: 'luckda.module.miss',
+      label: '该模块下缺少'
+    })).concat(action).concat((0, _utils.formatMessage)({
+      id: 'luckda.operates.Action',
+      label: '行为'
     }));
+    (0, _utils.showPop)(errorMsg);
   }
 };
 exports.doAction = doAction;
@@ -110,21 +115,23 @@ 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 _formData$value$id, _values$value$id;
+    var _values$value$id;
     if (values[value.id]) {
       var _dataSetKey = value.dataSetKey;
       switch (value.type) {
         case 'auto':
-          result[_dataSetKey] = (0, _objectSpread2.default)({
-            indocno: (_formData$value$id = formData[value.id]) === null || _formData$value$id === void 0 ? void 0 : _formData$value$id.indocno
+          result[_dataSetKey] = (0, _objectSpread4.default)({
+            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':
         case 'writer':
           var gridColumns = dataSets[_dataSetKey].map(function (col) {
-            if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, col), {}, {
+            if ((col.comName || _form.defaultComName[col.property]) === 'radio') return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, col), {}, {
               comName: 'select'
             });
             return col;
@@ -133,15 +140,13 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
           if ((0, _lodash.isArray)(values[value.id])) {
             _submitData = {
               addList: values[value.id].map(function (item) {
-                return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _utils2.dataFormat)(gridColumns, item)), {}, {
-                  indocno: null
-                });
+                return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, null));
               })
             };
           } else {
             _submitData = (0, _lodash.transform)(values[value.id], function (_result, _value, _key) {
               _result[_key] = _value.map(function (item) {
-                return (0, _utils2.dataFormat)(gridColumns, item);
+                return (0, _objectSpread4.default)((0, _objectSpread4.default)({}, (0, _utils2.dataFormat)(gridColumns, item)), {}, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, _key === 'addList' ? null : item[window.appConfig.constraintKeys.PRIMARY]));
               });
             }, {});
           }

package/lib/helper/form.js

@@ -18,6 +18,7 @@ var defaultComName = {
   number: 'number',
   money: 'number',
   decimal: 'number',
+  sint: 'number',
   string: 'string',
   text: 'textarea',
   date: 'date',
@@ -29,7 +30,8 @@ var defaultComName = {
   color: 'color',
   zone: 'region',
   year: 'year',
-  rte: 'editor'
+  rte: 'editor',
+  file: 'upload'
 };
 
 /**

package/lib/utils/form.js

@@ -38,6 +38,7 @@ function getFormItem() {
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (!property) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
+  if (property === 'sint') props.opt_decimal = 0;
   var _translator = (0, _form.translator)(props),
     name = _translator.name,
     translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
@@ -70,8 +71,8 @@ function getFormItem() {
 var formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var omitValues = {};
   var data = (0, _lodash.transform)(propsList, function (result, n) {
-    var _values$name, _values$name2;
     var _ref2 = n || {},
       comName = _ref2.comName,
       property = _ref2.property,
@@ -109,14 +110,14 @@ var formItemDataFormat = function formItemDataFormat() {
         result[name] = values[name];
         break;
       case 'upload':
-        result[name] = ((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.spath) || ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.url);
+        result[name] = values[name];
         break;
       default:
         if (!(0, _lodash.isNil)(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
     }
-    values = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
+    omitValues = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
   }, {});
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, values), data);
+  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, omitValues), data);
 };
 
 /**
@@ -128,37 +129,52 @@ 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$name, _values$name2, _values$name$;
     var _ref3 = n || {},
       comName = _ref3.comName,
       property = _ref3.property,
       props = (0, _objectWithoutProperties2.default)(_ref3, _excluded5);
     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() : undefined;
+        result[name] = values[name] ? (0, _moment.default)(values[name]).valueOf() : null;
         break;
       case 'user':
       case 'select':
       case 'group':
         if ((0, _lodash.isArray)(values[name])) result[name] = values[name].map(function (v) {
           return v.value || v.key;
-        }).join(',');else if (values[name]) result[name] = values[name].value || values[name].key;
+        }).join(',');else result[name] = !(0, _lodash.isNil)((_values$name = values[name]) === null || _values$name === void 0 ? void 0 : _values$name.value) ? values[name].value : ((_values$name2 = values[name]) === null || _values$name2 === void 0 ? void 0 : _values$name2.key) || null;
         break;
       case 'switch':
         result[name] = values[name] ? 1 : 0;
         break;
       case 'region':
-        result[name] = values[name] ? JSON.stringify(values[name]) : undefined;
+        result[name] = values[name] ? JSON.stringify(values[name]) : null;
         break;
       case 'year':
-        result[name] = values[name] ? (0, _moment.default)(values[name]).format('YYYY') : undefined;
+        result[name] = values[name] ? (0, _moment.default)(values[name]).format('YYYY') : null;
+        break;
+      case 'upload':
+        result[name] = values[name] ? (_values$name$ = values[name][0]) === null || _values$name$ === void 0 ? void 0 : _values$name$.name : null;
         break;
       default:
-        if (!(0, _lodash.isNil)(values[name])) result[name] = values[name];
+        result[name] = values[name];
     }
     values = (0, _lodash.omit)(values, [name, "".concat(name, "_cvt")]);
   }, {});

package/lib/utils/grid.js

@@ -76,6 +76,12 @@ function getColumnRender(name, type) {
         }).join('/') : undefined;
       };
       break;
+    case 'upload':
+      render = function render(text, record) {
+        var _text$;
+        return text && ((_text$ = text[0]) === null || _text$ === void 0 ? void 0 : _text$.name) || text;
+      };
+      break;
     default:
   }
   return render;
@@ -104,7 +110,7 @@ var getGridColumn = function getGridColumn() {
   };
   if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region'], comName || _form.defaultComName[property])) data.sortable = false;
   // data.filter = false;
-  if (filter) {
+  if (!(0, _lodash.isNil)(filter)) {
     // 因为后端升级问题，暂时关闭过滤功能
     data.filter = filter;
     data.filterParams = filterParams;

package/package.json

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