@guo514360255/antd-lib 1.4.8 → 1.4.10

package/dist/CustomDetailModal/index.js

@@ -12,7 +12,7 @@ var _excluded = ["type", "columns", "detailRequest", "handleDetailData", "title"
  */
 
 import { findTreeNodeByKey, isEmptyValue } from "../utils/util";
-import { Button, Descriptions, Drawer, Modal, Spin } from 'antd';
+import { Descriptions, Drawer, Image, Modal, Spin } from 'antd';
 import { isNumber, isString } from 'lodash';
 import isObject from 'lodash/isObject';
 import React, { forwardRef, useImperativeHandle, useState } from 'react';
@@ -149,14 +149,33 @@ var CustomModal = /*#__PURE__*/forwardRef(function (props, ref) {
     }
     return value;
   };
-  var footer = [/*#__PURE__*/React.createElement(Button, {
-    key: "cancel",
-    size: "large",
-    onClick: close
-  }, "\u786E\u5B9A")];
+  var DescImage = function DescImage(_ref4) {
+    var data = _ref4.data;
+    if (!data) return data;
+    var list = data;
+    if (typeof data === 'string') {
+      list = data.split(',');
+    }
+    return /*#__PURE__*/React.createElement(Image.PreviewGroup, null, /*#__PURE__*/React.createElement("div", {
+      style: {
+        display: 'flex',
+        flexWrap: 'wrap',
+        gap: 10
+      }
+    }, list.map(function (item, index) {
+      return /*#__PURE__*/React.createElement(Image, {
+        key: index,
+        width: 100,
+        src: item.url || item,
+        alt: item.name || item,
+        style: {
+          marginRight: 10
+        }
+      });
+    })));
+  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Component, _extends({
     width: other.width || 600,
-    footer: footer,
     title: "".concat(title || '', "\u8BE6\u60C5")
   }, other, {
     open: open,
@@ -169,12 +188,15 @@ var CustomModal = /*#__PURE__*/forwardRef(function (props, ref) {
     return !item.hideInDetail;
   }).map(function (item, index) {
     var _item$fieldProps;
+    console.log(item.type, detail[item.dataIndex]);
     return /*#__PURE__*/React.createElement(React.Fragment, {
       key: item.dataIndex
     }, /*#__PURE__*/React.createElement(Descriptions.Item, _extends({
       key: item.dataIndex,
       label: "".concat(item.title)
-    }, ((_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.descriptionsItemProps) || {}), handleDetailValue(item, detail[item.dataIndex], index) || '-'));
+    }, ((_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.descriptionsItemProps) || {}), item.type === 'upload' ? /*#__PURE__*/React.createElement(DescImage, {
+      data: detail[item.dataIndex]
+    }) : handleDetailValue(item, detail[item.dataIndex], index) || '-'));
   }))), /*#__PURE__*/React.createElement(Spin, {
     spinning: loading,
     fullscreen: true

package/dist/CustomFormModal/index.js

@@ -247,7 +247,7 @@ var CustomFormModal = /*#__PURE__*/forwardRef(function (props, ref) {
     ref: formRef
   }, handleColumns(columns || []).map(function (item) {
     var defaultPlaceholder = getPlaceholder(item.type, item.title);
-    return item.type === 'group' ? /*#__PURE__*/React.createElement(Form.List, {
+    return item.type === 'list' ? /*#__PURE__*/React.createElement(Form.List, {
       name: item.dataIndex,
       key: item.dataIndex
     }, function (fields, _ref2, _ref3) {

package/dist/CustomTable/index.js

@@ -5,7 +5,7 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["isIndex", "isDelete", "isUpdateState", "isDetail", "isUpdate", "isCreate", "createText", "columns", "rowKey", "request", "title", "defaultQueryParams", "toolBarRender", "dataSource", "deleteRequest", "detailRequest", "saveRequest", "updateRequest", "updateStateRequest", "handleModalData", "formProps", "detailProps"],
+var _excluded = ["isIndex", "isDelete", "isUpdateState", "isDetail", "isUpdate", "isCreate", "createText", "columns", "rowKey", "request", "title", "defaultQueryParams", "toolBarRender", "formList", "dataSource", "deleteRequest", "detailRequest", "saveRequest", "updateRequest", "updateStateRequest", "handleModalData", "formProps", "detailProps"],
   _excluded2 = ["list"];
 /*
  * @Author: 郭郭
@@ -43,6 +43,8 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     defaultQueryParams = _props$defaultQueryPa === void 0 ? {} : _props$defaultQueryPa,
     _props$toolBarRender = props.toolBarRender,
     _toolBarRender = _props$toolBarRender === void 0 ? [] : _props$toolBarRender,
+    _props$formList = props.formList,
+    formList = _props$formList === void 0 ? {} : _props$formList,
     _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? null : _props$dataSource,
     deleteRequest = props.deleteRequest,
@@ -407,6 +409,7 @@ var CustomTable = /*#__PURE__*/forwardRef(function (props, ref) {
     title: title,
     ref: formModalRef,
     tableActionRef: actionRef,
+    formList: formList,
     saveRequest: saveRequest,
     updateRequest: updateRequest,
     detailRequest: detailRequest,

package/dist/CustomTable/table.d.ts

@@ -136,6 +136,13 @@ interface CustomTableProps {
    */
   detailProps?: { [key: string]: any };
 
+  /**
+   * 表单组
+   */
+  formList?: {
+    [key: string]: any;
+  };
+
   /**
    * 其它参数
    */

package/dist/compontent.d.ts

@@ -24,7 +24,7 @@ interface CustomColumnProps extends ProColumns {
     | 'upload'
     | 'progress'
     | 'tag'
-    | 'group';
+    | 'list';
 
   /**
    * 是否必填

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guo514360255/antd-lib",
-  "version": "1.4.8",
+  "version": "1.4.10",
   "description": "react design 5 lib",
   "license": "MIT",
   "module": "dist/index.js",