@luck-design-biz/luckda 0.0.21 → 0.0.22-1

package/es/components/LdCard/index.js

@@ -7,7 +7,7 @@ var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "na
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
 import PropTypes from 'prop-types';
-import { Icon, Tooltip } from 'antd';
+import { Icon, Tooltip } from 'luck-design/antd';
 import { ResultSet, PermissionUtil } from 'luck-design';
 import { includes, difference } from 'lodash';
 import { useCreation, useMemoizedFn } from 'ahooks';

package/es/components/LdCom/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["options"];
 import React from 'react';
-import { Button, Tabs } from 'antd';
+import { Button, Tabs } from 'luck-design/antd';
 import { Collapse, ButtonRadio, IconFont } from '@luck-design-biz/base';
 import { ldComBuilder, filterOptions, deepFilterCom } from '../../helper/ldComBuild';
 export var LdButton = ldComBuilder(Button);

package/es/components/LdTree/index.js

@@ -10,7 +10,7 @@ import { isFunction, isNumber, transform, includes, remove, cloneDeep, keys } fr
 import { useRequest, useMemoizedFn, useCreation } from 'ahooks';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { Icon, Popover } from 'antd';
+import { Icon, Popover } from 'luck-design/antd';
 import { LuckTree } from 'luck-design';
 import { formatMessage, dataToTree, dragTreeData } from '@luck-design-biz/base/utils';
 import { TreeBox } from '@luck-design-biz/base';

package/es/helper/action.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 // 通用方法
-import { Modal } from 'antd';
+import { Modal } from 'luck-design/antd';
 import { showPop, formatMessage } from '@luck-design-biz/base/utils';
 import { transform, isArray, startsWith, keyBy } from 'lodash';
 import { dataFormat, behaviorCall } from '../utils';

package/es/upload/Form/gridForm.js

@@ -6,7 +6,7 @@ var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "upload
 import React, { useState, useRef, forwardRef } from 'react';
 import { getDvaApp } from 'umi';
 import { useMemoizedFn } from 'ahooks';
-import { Button, Upload, Tooltip, Icon } from 'antd';
+import { Button, Upload, Tooltip, Icon } from 'luck-design/antd';
 import moment from 'moment';
 import { last } from 'lodash';
 import { BasicForm, BasicFormItem, PopWindow } from 'luck-design';
@@ -114,17 +114,17 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
     if (file.status === 'done' && file.response && file.response.code === 1) {
       var _file$response2 = file.response,
-        _list = _file$response2.list,
-        _detail = _file$response2.detail;
+        list = _file$response2.list,
+        detail = _file$response2.detail;
       var data = {
-        uid: _detail[_list[0]].fileName,
+        uid: detail[list[0]].fileName,
         name: file.name,
         size: file.size,
-        fileId: _detail[_list[0]].fileName,
-        stype: _detail[_list[0]].fileExt,
+        fileId: detail[list[0]].fileName,
+        stype: detail[list[0]].fileExt,
         username: currentUser && currentUser.sname,
         uploadDate: moment().valueOf(),
-        previewUrl: _detail[_list[0]].previewUrl
+        previewUrl: detail[list[0]].previewUrl
       };
       gridRef.current.changeData(null, data);
     }
@@ -157,17 +157,19 @@ var UploadGridForm = function UploadGridForm(_ref) {
         data: formData
       }).then(function (res) {
         var code = res.code,
-          content = res.content;
+          list = res.list,
+          detail = res.detail,
+          msg = res.msg;
         if (code === 1) {
           setUploadLoading(false);
           setVisible(false);
-          content.forEach(function (file, index) {
+          list.forEach(function (i, index) {
             var data = {
-              uid: detail[list[0]].fileName,
-              name: values.files[index].name,
-              size: values.files[index].size,
-              stype: file.fileExt,
-              fileId: detail[list[0]].fileName,
+              uid: detail[i].fileName,
+              name: detail[i].origFileName,
+              size: detail[i].fileSize,
+              stype: detail[i].fileExt,
+              fileId: detail[i].fileName,
               username: currentUser && currentUser.sname,
               note: snote,
               uploadDate: moment().valueOf(),
@@ -184,6 +186,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
               }, 300);
             }
           });
+        } else {
+          setUploadLoading(false);
+          showPop(msg, null, 'error');
         }
       });
     }

package/es/upload/Form/index.js

@@ -55,7 +55,8 @@ function buildComponent(props) {
             stype: i.fileExt,
             username: i.sregnm,
             uploadDate: i.dregt,
-            previewUrl: i.previewUrl
+            previewUrl: i.previewUrl,
+            note: i.note
           };
         });
       }

package/es/upload/GridCell/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Popover, Icon } from 'antd';
+import { Popover, Icon } from 'luck-design/antd';
 var UploadGridCell = function UploadGridCell(_ref) {
   var _ref$fileList = _ref.fileList,
     fileList = _ref$fileList === void 0 ? [] : _ref$fileList,

package/es/utils/grid.js

@@ -7,7 +7,7 @@ var _excluded = ["comName", "property"],
 import React from "react";
 import { getDvaApp } from 'umi';
 import { merge, isNil, isArray, includes, capitalize } from 'lodash';
-import { Switch, Tag } from 'antd';
+import { Switch, Tag } from 'luck-design/antd';
 import moment from 'moment';
 import UploadGridCell from '../upload/GridCell';
 import { formatMessage } from '@luck-design-biz/base/utils';
@@ -126,7 +126,7 @@ export var getGridColumn = function getGridColumn() {
     filter = _merge.filter,
     filterParams = _merge.filterParams,
     _props = _objectWithoutProperties(_merge, _excluded3);
-  var _extra = JSON.parse(extra);
+  var _extra = JSON.parse(extra) || {};
   var data = _objectSpread(_objectSpread({}, _props), {}, {
     field: name,
     title: _props.label,
@@ -235,6 +235,8 @@ export var getGridColumn = function getGridColumn() {
         };
         break;
       case 'upload':
+      case 'textarea':
+      case 'editor':
         data.filter = false;
         break;
       default:

package/lib/components/LdCard/index.js

@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard(require("react"));
 var _umi = require("umi");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _luckDesign = require("luck-design");
 var _lodash = require("lodash");
 var _ahooks = require("ahooks");

package/lib/components/LdCom/index.js

@@ -8,7 +8,7 @@ exports.LdTabs = exports.LdIconFont = exports.LdCollapse = exports.LdButtonRadio
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _base = require("@luck-design-biz/base");
 var _ldComBuild = require("../../helper/ldComBuild");
 var _excluded = ["options"];

package/lib/components/LdTree/index.js

@@ -16,7 +16,7 @@ var _lodash = require("lodash");
 var _ahooks = require("ahooks");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _luckDesign = require("luck-design");
 var _utils = require("@luck-design-biz/base/utils");
 var _base = require("@luck-design-biz/base");

package/lib/helper/action.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.onBatchSubmitAction = exports.doAction = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _utils = require("@luck-design-biz/base/utils");
 var _lodash = require("lodash");
 var _utils2 = require("../utils");

package/lib/upload/Form/gridForm.js

@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard(require("react"));
 var _umi = require("umi");
 var _ahooks = require("ahooks");
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _lodash = require("lodash");
 var _luckDesign = require("luck-design");
@@ -122,17 +122,17 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
     if (file.status === 'done' && file.response && file.response.code === 1) {
       var _file$response2 = file.response,
-        _list = _file$response2.list,
-        _detail = _file$response2.detail;
+        list = _file$response2.list,
+        detail = _file$response2.detail;
       var data = {
-        uid: _detail[_list[0]].fileName,
+        uid: detail[list[0]].fileName,
         name: file.name,
         size: file.size,
-        fileId: _detail[_list[0]].fileName,
-        stype: _detail[_list[0]].fileExt,
+        fileId: detail[list[0]].fileName,
+        stype: detail[list[0]].fileExt,
         username: currentUser && currentUser.sname,
         uploadDate: (0, _moment.default)().valueOf(),
-        previewUrl: _detail[_list[0]].previewUrl
+        previewUrl: detail[list[0]].previewUrl
       };
       gridRef.current.changeData(null, data);
     }
@@ -165,17 +165,19 @@ var UploadGridForm = function UploadGridForm(_ref) {
         data: formData
       }).then(function (res) {
         var code = res.code,
-          content = res.content;
+          list = res.list,
+          detail = res.detail,
+          msg = res.msg;
         if (code === 1) {
           setUploadLoading(false);
           setVisible(false);
-          content.forEach(function (file, index) {
+          list.forEach(function (i, index) {
             var data = {
-              uid: detail[list[0]].fileName,
-              name: values.files[index].name,
-              size: values.files[index].size,
-              stype: file.fileExt,
-              fileId: detail[list[0]].fileName,
+              uid: detail[i].fileName,
+              name: detail[i].origFileName,
+              size: detail[i].fileSize,
+              stype: detail[i].fileExt,
+              fileId: detail[i].fileName,
               username: currentUser && currentUser.sname,
               note: snote,
               uploadDate: (0, _moment.default)().valueOf(),
@@ -192,6 +194,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
               }, 300);
             }
           });
+        } else {
+          setUploadLoading(false);
+          (0, _utils.showPop)(msg, null, 'error');
         }
       });
     }

package/lib/upload/Form/index.js

@@ -62,7 +62,8 @@ function buildComponent(props) {
             stype: i.fileExt,
             username: i.sregnm,
             uploadDate: i.dregt,
-            previewUrl: i.previewUrl
+            previewUrl: i.previewUrl,
+            note: i.note
           };
         });
       }

package/lib/upload/GridCell/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var UploadGridCell = function UploadGridCell(_ref) {
   var _ref$fileList = _ref.fileList,
     fileList = _ref$fileList === void 0 ? [] : _ref$fileList,

package/lib/utils/grid.js

@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _umi = require("umi");
 var _lodash = require("lodash");
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _GridCell = _interopRequireDefault(require("../upload/GridCell"));
 var _utils = require("@luck-design-biz/base/utils");
@@ -134,7 +134,7 @@ var getGridColumn = function getGridColumn() {
     filter = _merge.filter,
     filterParams = _merge.filterParams,
     _props = (0, _objectWithoutProperties2.default)(_merge, _excluded3);
-  var _extra = JSON.parse(extra);
+  var _extra = JSON.parse(extra) || {};
   var data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
     field: name,
     title: _props.label,
@@ -243,6 +243,8 @@ var getGridColumn = function getGridColumn() {
         };
         break;
       case 'upload':
+      case 'textarea':
+      case 'editor':
         data.filter = false;
         break;
       default:

package/package.json

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