@luck-design-biz/luckda 0.0.15-7 → 0.0.16

package/lib/utils/form.js

@@ -13,6 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _moment = _interopRequireDefault(require("moment"));
 var _lodash = require("lodash");
+var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var _form = require("../helper/form");
 var _grid = require("./grid");
 var formItemUtils = _interopRequireWildcard(require("../helper/FromItems"));
@@ -110,8 +111,17 @@ var formItemDataFormat = function formItemDataFormat() {
         result[name] = values[name];
         break;
       case 'upload':
-        result[name] = values[name];
-        result["".concat(name, "_virtual")] = values["".concat(name, "_virtual")];
+        result[name] = (values["".concat(name, "_virtual")] || []).map(function (file) {
+          return {
+            uid: file.fileName,
+            status: 'done',
+            name: file.origFileName,
+            ext: file.fileExt,
+            size: file.fileSize,
+            url: "".concat(_ApiConfig.default.LUCKDA_HOST).concat(file.previewUrl),
+            thumbUrl: "".concat(_ApiConfig.default.LUCKDA_HOST).concat(file.previewUrl)
+          };
+        });
         break;
       default:
         if (!(0, _lodash.isNil)(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
@@ -142,15 +152,6 @@ 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;
@@ -172,7 +173,19 @@ var dataFormat = function dataFormat() {
         result[name] = values[name] ? (0, _moment.default)(values[name]).format('YYYY') : null;
         break;
       case 'upload':
-        result[name] = values[name] && values[name][0] ? values[name][0].name : null;
+        result[name] = values[name] ? values[name].map(function (v) {
+          if (v.newFile) return {
+            objectName: v.uid,
+            marker: 'add'
+          };
+          if (v.deleteFile) return {
+            objectName: v.uid,
+            marker: 'delete'
+          };
+          return {
+            objectName: v.uid
+          };
+        }) : undefined;
         break;
       default:
         result[name] = values[name];

package/lib/utils/grid.js

@@ -13,8 +13,10 @@ var _umi = require("umi");
 var _lodash = require("lodash");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
-var _form = require("../helper/form");
+var _base = require("@luck-design-biz/base");
 var _utils = require("@luck-design-biz/base/utils");
+var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
+var _form = require("../helper/form");
 var _excluded = ["comName", "property"],
   _excluded2 = ["name"],
   _excluded3 = ["filter", "filterParams"];
@@ -79,8 +81,17 @@ function getColumnRender(name, type) {
       break;
     case 'upload':
       render = function render(text, record) {
-        var _text$;
-        return text && ((_text$ = text[0]) === null || _text$ === void 0 ? void 0 : _text$.name) || text;
+        var fileList = [];
+        if (record["".concat(name, "_virtual")]) fileList = record["".concat(name, "_virtual")].map(function (file) {
+          return {
+            uid: file.fileName,
+            name: file.origFileName,
+            previewUrl: "".concat(_ApiConfig.default.LUCKDA_HOST).concat(file.previewUrl)
+          };
+        });
+        return /*#__PURE__*/_react.default.createElement(_base.UploadGridCell, {
+          fileList: fileList
+        });
       };
       break;
     default:
@@ -108,7 +119,7 @@ var getGridColumn = function getGridColumn() {
     title: _props.label,
     render: _props.render || getColumnRender(name, comName || _form.defaultComName[property], _props)
   });
-  if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region'], comName || _form.defaultComName[property])) data.sortable = false;
+  if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region', 'file'], comName || _form.defaultComName[property])) data.sortable = false;
   // data.filter = false;
   if (!(0, _lodash.isNil)(filter)) {
     // 因为后端升级问题，暂时关闭过滤功能
@@ -208,6 +219,9 @@ var getGridColumn = function getGridColumn() {
           key: name
         };
         break;
+      case 'upload':
+        data.filter = false;
+        break;
       default:
         data.filter = 'text';
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.15-7",
+  "version": "0.0.16",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -17,7 +17,8 @@
   "files": [
     "es",
     "lib",
-    "utils.js"
+    "utils.js",
+    "upload.js"
   ],
   "main": "lib/index.js",
   "module": "es/index.js",

package/upload.js

@@ -0,0 +1 @@
+module.exports = require('./es/upload');