@arim-aisdc/public-components 2.2.0 → 2.2.2

package/dist/components/BaseInfo/BaseInfo.d.ts

@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
     value: any;
     field: string;
     label?: string;
-    text: string | JSX.Element | Element;
+    text: string | Element | JSX.Element;
     units?: string;
     width?: string;
     labelWidth?: string;

package/dist/components/CustomForm/CustomForm.js

@@ -399,6 +399,7 @@ var CustomForm = function CustomForm(_ref, ref) {
       case CustomFormItemType.DateTime:
         element = /*#__PURE__*/_jsx(DatePicker, {
           showTime: true,
+          picker: (item === null || item === void 0 ? void 0 : item.picker) || 'date',
           style: {
             width: item !== null && item !== void 0 && item.wapperWidth ? item === null || item === void 0 ? void 0 : item.wapperWidth : '100%'
           }

package/dist/components/CustomForm/UploadImg/index.js

@@ -34,6 +34,10 @@ var UploadImg = function UploadImg(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     imageUrl = _useState4[0],
     setImageUrl = _useState4[1];
+  var _useState5 = useState('上传'),
+    _useState6 = _slicedToArray(_useState5, 2),
+    operateText = _useState6[0],
+    setOperateText = _useState6[1];
 
   // 获取图片URL
   var getIMGUrl = /*#__PURE__*/function () {
@@ -42,43 +46,48 @@ var UploadImg = function UploadImg(_ref) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            setLoading(true);
+            setOperateText('获取中...');
             url = "".concat(item === null || item === void 0 ? void 0 : item.baseUrl, "/api/file-management/file-descriptor/content");
             query = {
               id: id
             };
-            _context.prev = 2;
-            _context.next = 5;
+            _context.prev = 4;
+            _context.next = 7;
             return fetch("".concat(url, "?id=").concat(query.id), {
               method: 'GET',
               headers: {
                 Authorization: "Bearer ".concat(item === null || item === void 0 ? void 0 : item.token)
               }
             });
-          case 5:
+          case 7:
             response = _context.sent;
             if (!response.ok) {
-              _context.next = 12;
+              _context.next = 14;
               break;
             }
-            _context.next = 9;
+            _context.next = 11;
             return response.text();
-          case 9:
+          case 11:
             data = _context.sent.replace(/^"|"$/g, '');
             baseIMG = "data:image/png;base64,".concat(data);
             setImageUrl(baseIMG);
-          case 12:
-            _context.next = 18;
-            break;
           case 14:
-            _context.prev = 14;
-            _context.t0 = _context["catch"](2);
+            _context.next = 20;
+            break;
+          case 16:
+            _context.prev = 16;
+            _context.t0 = _context["catch"](4);
             setImageUrl('');
             message.error('获取图片失败');
-          case 18:
+          case 20:
+            setLoading(false);
+            setOperateText('上传');
+          case 22:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 14]]);
+      }, _callee, null, [[4, 16]]);
     }));
     return function getIMGUrl(_x) {
       return _ref2.apply(this, arguments);
@@ -88,13 +97,22 @@ var UploadImg = function UploadImg(_ref) {
   // 处理图片上传
   var handleChange = function handleChange(_ref3) {
     var file = _ref3.file;
-    setLoading(true);
-    if ((file === null || file === void 0 ? void 0 : file.status) === 'done') {
+    if (file.status === 'uploading') {
+      setLoading(true);
+      setOperateText('上传中...');
+      return;
+    }
+    if (file.status === 'done') {
       var _file$response;
+      setLoading(false);
       message.success('上传成功');
       onChange === null || onChange === void 0 || onChange(file === null || file === void 0 || (_file$response = file.response) === null || _file$response === void 0 ? void 0 : _file$response.id);
     }
-    setLoading(false);
+    if (file.status === 'error') {
+      setLoading(false);
+      message.error('上传失败');
+      setOperateText('上传');
+    }
   };
 
   // 初始化时如果有value则获取图片
@@ -108,10 +126,11 @@ var UploadImg = function UploadImg(_ref) {
       style: {
         marginTop: 8
       },
-      children: "Upload"
+      children: operateText
     })]
   });
   return /*#__PURE__*/_jsx(Upload, {
+    accept: ".jpg, .jpeg, .png, .gif, .bmp, .webp, .svg",
     listType: "picture-card",
     name: "file",
     showUploadList: false,

package/dist/components/CustomForm/type.d.ts

@@ -58,6 +58,8 @@ export declare enum PickerType {
     Week = "week",
     Quarter = "quarter "
 }
+type PanelMode = 'time' | 'date' | 'week' | 'month' | 'quarter' | 'year' | 'decade';
+export type PickerMode = Exclude<PanelMode, 'datetime' | 'decade'>;
 export type CustomSearchFieldType = {
     field: string;
     label?: ReactNode | string;
@@ -70,7 +72,7 @@ export type CustomSearchFieldType = {
     maxLength?: number;
     rows?: number;
     wapperWidth?: number;
-    picker?: PickerType;
+    picker?: PickerType | PickerMode;
     defaultFormat?: any;
     showTimeFormat?: any;
     allowClear?: boolean;
@@ -121,7 +123,7 @@ export type CustomSearchFieldType = {
     labelInValue?: boolean;
     baseUrl?: string;
     token?: any;
-    method?: "POST" | "PUT" | "PATCH";
+    method?: 'POST' | 'PUT' | 'PATCH';
 };
 export interface CustomFormProps {
     data: CustomSearchFieldType[];
@@ -159,3 +161,4 @@ export interface CustomFormProps {
     labelAlign?: FormLabelAlign;
     btnSpan?: number;
 }
+export {};

package/dist/components/TableMax/tableMax.less

@@ -133,6 +133,9 @@
           box-sizing: border-box;
           height: fit-content;
           flex: 1;
+          .cell-wapper {
+            line-height: @global-table-max-header-cell-wapper-line-height;
+          }
         }
 
         .table-header-scroll {
@@ -146,6 +149,9 @@
         overflow: auto scroll;
         font-weight: @global-table-max-body-font-weight;
         // background: @tableColor2;
+        .tbody-tr-td {
+          line-height: @global-table-body-tbody-tr-td-line-height;
+        }
 
         &::-webkit-scrollbar {
           width: 10px;

package/dist/themes/variables.less

@@ -66,4 +66,5 @@
 @global-table-max-scrollbar-track: var(--global-table-max-scrollbar-track, #E8E8E8);
 @global-table-max-header-font-weight: var(--global-table-max-header-font-weight);
 @global-table-max-body-font-weight: var(--global-table-max-body-font-weight);
-
+@global-table-max-header-cell-wapper-line-height: var(--global-table-max-header-cell-wapper-line-height, 16px);
+@global-table-body-tbody-tr-td-line-height: var(--global-table-body-tbody-tr-td-line-height, 32px);

package/dist/themes/variablesConfig.js

@@ -14,19 +14,22 @@ var tableMaxCommonStyle = {
   '--global-table-max-center-border-radius': 'unset',
   '--global-table-max-center-border-bottom': 'none',
   '--global-table-max-header-font-weight': '400',
-  '--global-table-max-body-font-weight': '400'
+  '--global-table-max-body-font-weight': '400',
+  '--global-table-max-header-cell-wapper-line-height': '16px',
+  '--global-table-body-tbody-tr-td-line-height': '32px'
 };
 var tableMaxCommonStyleTwo = {
   '--global-table-max-padding-top': '8px',
   '--global-table-max-padding-left': '8px',
   '--global-table-max-padding-right': '16px',
   '--global-table-max-padding-bottom': '7px',
-  '--global-table-max-border': '1px solid #D9D9D9',
   '--global-table-max-footer-border-radius': '0px 0px 8px 8px',
   '--global-table-max-center-border-radius': '8px 8px 0px 0px',
   '--global-table-max-center-border-bottom': 'none',
   '--global-table-max-header-font-weight': '500',
-  '--global-table-max-body-font-weight': '400'
+  '--global-table-max-body-font-weight': '400',
+  '--global-table-max-header-cell-wapper-line-height': '32px',
+  '--global-table-body-tbody-tr-td-line-height': '42px'
 };
 export var PublicThemeVariablesConfig = {
   light: _objectSpread({
@@ -268,7 +271,8 @@ export var PublicThemeVariablesConfigTwo = {
     // 卡片、表格body背景色 -1
     '--global-card-effect-background-color': '#E8E8E8',
     '--global-default-text-color': '#242A30',
-    '--global-table-max-scrollbar-track': '#E8E8E8'
+    '--global-table-max-scrollbar-track': '#E8E8E8',
+    '--global-table-max-border': '1px solid #D9D9D9'
   }, tableMaxCommonStyleTwo),
   dark: _objectSpread({
     '--global-curd-input-background-color': '#494c5dff',
@@ -349,7 +353,8 @@ export var PublicThemeVariablesConfigTwo = {
     // 卡片、表格body背景色 -1
     '--global-card-effect-background-color': '#1E345B',
     '--global-default-text-color': '#fff',
-    '--global-table-max-scrollbar-track': '#334155'
+    '--global-table-max-scrollbar-track': '#334155',
+    '--global-table-max-border': '1px solid #475569'
   }, tableMaxCommonStyleTwo)
 };
 export var publicThemeMap = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",