@luck-design-biz/luckda 0.0.22-2 → 0.0.22-4

package/es/services.js

@@ -2,7 +2,7 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import { stringify } from 'querystring';
 import { request } from '@luck-design-biz/base/utils';
-import api from "../src/services/ApiConfig";
+import api from "@/services/ApiConfig";
 export function readModlue(_x) {
   return _readModlue.apply(this, arguments);
 }

package/es/upload/Form/gridForm.js

@@ -5,14 +5,14 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
 import React, { useState, useRef, forwardRef } from 'react';
 import { getDvaApp } from 'umi';
-import { useMemoizedFn } from 'ahooks';
+import { useMemoizedFn, useCreation } from 'ahooks';
 import { Button, Upload, Tooltip, Icon } from 'luck-design/antd';
 import moment from 'moment';
 import { last } from 'lodash';
 import { BasicForm, BasicFormItem, PopWindow } from 'luck-design';
-import api from "../../../src/services/ApiConfig";
+import api from "@/services/ApiConfig";
 import { FormBtn, GridForm } from '@luck-design-biz/base/FormList';
-import { byteConvert, formatMessage, beforeUpload as _beforeUpload2, patchDownloadZip, showPop, request, canPreview } from '@luck-design-biz/base/utils';
+import { byteConvert, formatMessage, beforeUpload as _beforeUpload2, getSupportUploadTypes, patchDownloadZip, showPop, request, canPreview } from '@luck-design-biz/base/utils';
 var columns = [{
   field: 'name',
   title: '附件名称'
@@ -77,6 +77,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
   var gridRef = wrapperRef || useRef(null);
   var _getDvaApp$_store$get = (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
+  var supportUploadTypes = useCreation(function () {
+    return getSupportUploadTypes(forbiddenTypes);
+  }, [forbiddenTypes]);
 
   // 下载
   var downloadFile = function downloadFile(filenames, tag) {
@@ -209,7 +212,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
         var upload = _beforeUpload2({
           file: file,
           fileList: fileList,
-          forbiddenTypes: forbiddenTypes,
+          supportUploadTypes: supportUploadTypes,
           beforeUpload: _beforeUpload
         });
         if (!upload) setUploadLoading(false);
@@ -232,7 +235,15 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }, formatMessage({
       id: 'app.base.operate.add',
       label: '添加'
-    })) : /*#__PURE__*/React.createElement(FormBtn, {
+    })) : /*#__PURE__*/React.createElement(Tooltip, {
+      title: "".concat(formatMessage({
+        id: 'app.upload.supportUpload',
+        label: '支持上传'
+      })).concat(supportUploadTypes.join('，')).concat(formatMessage({
+        id: 'app.upload.supportUpload.type',
+        label: '类型的文件'
+      }))
+    }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(FormBtn, {
       formId: "formId"
     }, /*#__PURE__*/React.createElement(Upload, formItemProps, /*#__PURE__*/React.createElement(Button, {
       type: "primary",
@@ -243,7 +254,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }, formatMessage({
       id: 'app.base.operate.add',
       label: '添加'
-    }))))), /*#__PURE__*/React.createElement(Button, {
+    }))))))), /*#__PURE__*/React.createElement(Button, {
       type: "primary",
       onClick: function onClick() {
         var _gridRef$current$form;
@@ -348,6 +359,13 @@ var UploadGridForm = function UploadGridForm(_ref) {
     type: "upload",
     name: "files",
     label: "\u9644\u4EF6",
+    extra: "".concat(formatMessage({
+      id: 'app.upload.supportUpload',
+      label: '支持上传'
+    })).concat(supportUploadTypes.join('，')).concat(formatMessage({
+      id: 'app.upload.supportUpload.type',
+      label: '类型的文件'
+    })),
     config: _objectSpread(_objectSpread({}, rest), {}, {
       required: true,
       message: '请上传',
@@ -359,7 +377,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
         return _beforeUpload2({
           file: file,
           fileList: fileList,
-          forbiddenTypes: forbiddenTypes,
+          supportUploadTypes: supportUploadTypes,
           beforeUpload: _beforeUpload
         });
       }

package/es/upload/FormItem/index.js

@@ -4,7 +4,8 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "forbiddenTypes", "children", "dataFormat", "listType"];
 import React from 'react';
 import { BasicFormItem } from 'luck-design';
-import { formatMessage, beforeUpload as _beforeUpload } from '@luck-design-biz/base/utils';
+import { formatMessage, beforeUpload as _beforeUpload, getSupportUploadTypes } from '@luck-design-biz/base/utils';
+import { useCreation } from 'ahooks';
 
 /**
  * 表单类型富文本上传
@@ -42,7 +43,18 @@ function buildComponent(props) {
   var getUrl = function getUrl(behaviorKey) {
     return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
   };
-  return /*#__PURE__*/React.createElement(BasicFormItem, _extends({}, rest, {
+  var supportUploadTypes = useCreation(function () {
+    return getSupportUploadTypes(forbiddenTypes);
+  }, [forbiddenTypes]);
+  return /*#__PURE__*/React.createElement(BasicFormItem, _extends({
+    extra: "".concat(formatMessage({
+      id: 'app.upload.supportUpload',
+      label: '支持上传'
+    })).concat(supportUploadTypes.join('，')).concat(formatMessage({
+      id: 'app.upload.supportUpload.type',
+      label: '类型的文件'
+    }))
+  }, rest, {
     type: "uploadV3",
     config: _objectSpread(_objectSpread({
       required: false,
@@ -68,7 +80,7 @@ function buildComponent(props) {
         return _beforeUpload({
           file: file,
           fileList: fileList,
-          forbiddenTypes: forbiddenTypes,
+          supportUploadTypes: supportUploadTypes,
           beforeUpload: config && config.beforeUpload
         });
       }

package/es/utils/form.js

@@ -13,7 +13,7 @@ var _excluded = ["comName", "property"],
 import React from 'react';
 import moment from 'moment';
 import { capitalize, merge, transform, isArray, omit, isNil, clone } from 'lodash';
-import api from "../../src/services/ApiConfig";
+import api from "@/services/ApiConfig";
 import { defaultComName, translator, splitStrToObj, formatCustomProps } from "../helper/form";
 import { getColumnRender } from "./grid";
 import * as formItemUtils from "../helper/FromItems";

package/es/utils/grid.js

@@ -10,7 +10,7 @@ import { Switch, Tag } from 'luck-design/antd';
 import moment from 'moment';
 import UploadGridCell from "../upload/GridCell";
 import { formatMessage } from '@luck-design-biz/base/utils';
-import api from "../../src/services/ApiConfig";
+import api from "@/services/ApiConfig";
 import { defaultComName, translator, formatCustomProps, splitStrToObj } from "../helper/form";
 import * as formItemUtils from "../helper/FromItems";
 

package/lib/services.js

@@ -10,7 +10,7 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _querystring = require("querystring");
 var _utils = require("@luck-design-biz/base/utils");
-var _ApiConfig = _interopRequireDefault(require("../src/services/ApiConfig"));
+var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 function readModlue(_x) {
   return _readModlue.apply(this, arguments);
 }

package/lib/upload/Form/gridForm.js

@@ -17,7 +17,7 @@ var _antd = require("luck-design/antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _lodash = require("lodash");
 var _luckDesign = require("luck-design");
-var _ApiConfig = _interopRequireDefault(require("../../../src/services/ApiConfig"));
+var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var _FormList = require("@luck-design-biz/base/FormList");
 var _utils = require("@luck-design-biz/base/utils");
 var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
@@ -85,6 +85,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
   var gridRef = wrapperRef || (0, _react.useRef)(null);
   var _getDvaApp$_store$get = (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.getState().user,
     currentUser = _getDvaApp$_store$get.currentUser;
+  var supportUploadTypes = (0, _ahooks.useCreation)(function () {
+    return (0, _utils.getSupportUploadTypes)(forbiddenTypes);
+  }, [forbiddenTypes]);
 
   // 下载
   var downloadFile = function downloadFile(filenames, tag) {
@@ -217,7 +220,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
         var upload = (0, _utils.beforeUpload)({
           file: file,
           fileList: fileList,
-          forbiddenTypes: forbiddenTypes,
+          supportUploadTypes: supportUploadTypes,
           beforeUpload: _beforeUpload
         });
         if (!upload) setUploadLoading(false);
@@ -240,7 +243,15 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }, (0, _utils.formatMessage)({
       id: 'app.base.operate.add',
       label: '添加'
-    })) : /*#__PURE__*/_react.default.createElement(_FormList.FormBtn, {
+    })) : /*#__PURE__*/_react.default.createElement(_antd.Tooltip, {
+      title: "".concat((0, _utils.formatMessage)({
+        id: 'app.upload.supportUpload',
+        label: '支持上传'
+      })).concat(supportUploadTypes.join('，')).concat((0, _utils.formatMessage)({
+        id: 'app.upload.supportUpload.type',
+        label: '类型的文件'
+      }))
+    }, /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_FormList.FormBtn, {
       formId: "formId"
     }, /*#__PURE__*/_react.default.createElement(_antd.Upload, formItemProps, /*#__PURE__*/_react.default.createElement(_antd.Button, {
       type: "primary",
@@ -251,7 +262,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }, (0, _utils.formatMessage)({
       id: 'app.base.operate.add',
       label: '添加'
-    }))))), /*#__PURE__*/_react.default.createElement(_antd.Button, {
+    }))))))), /*#__PURE__*/_react.default.createElement(_antd.Button, {
       type: "primary",
       onClick: function onClick() {
         var _gridRef$current$form;
@@ -356,6 +367,13 @@ var UploadGridForm = function UploadGridForm(_ref) {
     type: "upload",
     name: "files",
     label: "\u9644\u4EF6",
+    extra: "".concat((0, _utils.formatMessage)({
+      id: 'app.upload.supportUpload',
+      label: '支持上传'
+    })).concat(supportUploadTypes.join('，')).concat((0, _utils.formatMessage)({
+      id: 'app.upload.supportUpload.type',
+      label: '类型的文件'
+    })),
     config: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
       required: true,
       message: '请上传',
@@ -367,7 +385,7 @@ var UploadGridForm = function UploadGridForm(_ref) {
         return (0, _utils.beforeUpload)({
           file: file,
           fileList: fileList,
-          forbiddenTypes: forbiddenTypes,
+          supportUploadTypes: supportUploadTypes,
           beforeUpload: _beforeUpload
         });
       }

package/lib/upload/FormItem/index.js

@@ -11,6 +11,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _luckDesign = require("luck-design");
 var _utils = require("@luck-design-biz/base/utils");
+var _ahooks = require("ahooks");
 var _excluded = ["uploadUrl", "moduleCode", "bucket", "tag", "note", "config", "forbiddenTypes", "children", "dataFormat", "listType"];
 /**
  * 表单类型富文本上传
@@ -48,7 +49,18 @@ function buildComponent(props) {
   var getUrl = function getUrl(behaviorKey) {
     return "".concat(window.appConfig.OSS_HOST_V3, "?moduleCode=").concat(moduleCode, "&behaviorKey=").concat(behaviorKey, "&bucket=").concat(bucket, "&tag=").concat(tag, "&note=").concat(note);
   };
-  return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({}, rest, {
+  var supportUploadTypes = (0, _ahooks.useCreation)(function () {
+    return (0, _utils.getSupportUploadTypes)(forbiddenTypes);
+  }, [forbiddenTypes]);
+  return /*#__PURE__*/_react.default.createElement(_luckDesign.BasicFormItem, (0, _extends2.default)({
+    extra: "".concat((0, _utils.formatMessage)({
+      id: 'app.upload.supportUpload',
+      label: '支持上传'
+    })).concat(supportUploadTypes.join('，')).concat((0, _utils.formatMessage)({
+      id: 'app.upload.supportUpload.type',
+      label: '类型的文件'
+    }))
+  }, rest, {
     type: "uploadV3",
     config: (0, _objectSpread2.default)((0, _objectSpread2.default)({
       required: false,
@@ -74,7 +86,7 @@ function buildComponent(props) {
         return (0, _utils.beforeUpload)({
           file: file,
           fileList: fileList,
-          forbiddenTypes: forbiddenTypes,
+          supportUploadTypes: supportUploadTypes,
           beforeUpload: config && config.beforeUpload
         });
       }

package/lib/utils/form.js

@@ -13,7 +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("../../src/services/ApiConfig"));
+var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var _form = require("../helper/form");
 var _grid = require("./grid");
 var formItemUtils = _interopRequireWildcard(require("../helper/FromItems"));

package/lib/utils/grid.js

@@ -16,7 +16,7 @@ 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");
-var _ApiConfig = _interopRequireDefault(require("../../src/services/ApiConfig"));
+var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
 var _form = require("../helper/form");
 var formItemUtils = _interopRequireWildcard(require("../helper/FromItems"));
 var _excluded = ["comName", "property"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.22-2",
+  "version": "0.0.22-4",
   "description": "前端配置管理中心业务组件库",
   "scripts": {
     "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",