@lingxiteam/ebe-utils 0.0.27 → 0.0.29

package/es/constants.js

@@ -148,7 +148,6 @@ var componentsRule = {
           showQuickJumper: false,
           dataSourceLoading: false,
           showTotal: false,
-          page: false,
           isFlexColumn: false,
           checkLoosed: false,
           fixedAction: false,

package/es/index.js

@@ -22,6 +22,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { generateCode, init as ebeInit, publishers } from '@lingxiteam/ebe';
 import { lingxiDslRules } from "./constants";
+import RequestQueue from "./requestQueue";
 export * from "./types";
 var isArray = function isArray(arr) {
   if (Array.isArray) {
@@ -219,7 +220,7 @@ export var clearLXPagesDSL = function clearLXPagesDSL(pages) {
   });
 };
 export var getSafeTypeName = function getSafeTypeName(name) {
-  return name.replaceAll(' ', '').replaceAll('/', '').replaceAll('-', '').replaceAll('(', '').replaceAll(')', '');
+  return name.replaceAll(' ', '').replaceAll('/', '').replaceAll('-', '').replaceAll('(', '').replaceAll('，', '').replaceAll(',', '').replaceAll(')', '');
 };
 var workerJsUrl = '';
 export var setWorkerJsUrl = function setWorkerJsUrl(url) {
@@ -250,7 +251,7 @@ var getIsIncrementalConstruction = function getIsIncrementalConstruction(ic) {
 export var fetchData = /*#__PURE__*/function () {
   var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
     var _ref6, _attrSpecPage;
-    var appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, incrementalConstruction, isIncrementalConstruction, attrSpecPage, incrementalConstructionPageList, globalDataInfo, busiData, themeCss, frontendHookList, pageTypeMap, globalDataMap, appInfo, appPageList, temCompAssetList, compAssetList, _globalDataInfo, dataSourceList, pageIdMapping, lastPageId, data, needFindDataPages, pages, _yield$services$qryBu, itemLists, _incrementalConstruct, itemHash, _itemLists, alllBusiComp, busiPages, getTranslateName, chinese, translateNames, key, _translateNames, translateName, pagePathEnglishMapping, pagePathEnglishSet, getName, pagesChinese, pagesTranslateNames, findPageKeyByPageId, _key2, _appPageList$_key2$pa, _pagePathEnglishMappi, _pagesTranslateNames, safeTranslateName, pageKey, pageDSLS, getPlatform, options, cleanedTree;
+    var appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, incrementalConstruction, isIncrementalConstruction, attrSpecPage, incrementalConstructionPageList, globalDataInfo, busiData, themeCss, frontendHookList, pageTypeMap, globalDataMap, appInfo, appPageList, temCompAssetList, compAssetList, _globalDataInfo, dataSourceList, pageIdMapping, lastPageId, data, needFindDataPages, requestQueue, requests, pages, _yield$services$qryBu, itemLists, BusiCompRequest, _incrementalConstruct, itemHash, _itemLists, alllBusiComp, busiPages, getTranslateName, chinese, translateNames, key, _translateNames, translateName, pagePathEnglishMapping, pagePathEnglishSet, getName, pagesChinese, pagesTranslateNames, findPageKeyByPageId, _key2, _appPageList$_key2$pa, _pagePathEnglishMappi, _pagesTranslateNames, safeTranslateName, pageKey, pageDSLS, getPlatform, options, cleanedTree;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -408,20 +409,28 @@ export var fetchData = /*#__PURE__*/function () {
             progress: 5
           });
           needFindDataPages = isIncrementalConstruction ? incrementalConstructionPageList : appPageList;
-          _context3.next = 57;
-          return Promise.all(needFindDataPages.map(function (i) {
+          requestQueue = new RequestQueue(8);
+          requests = needFindDataPages.map(function (i) {
             lastPageId = i.pageId;
             pageIdMapping[i.pagePath] = i.pageId;
-            return services.findPageInstByVersionId({
-              appId: appId,
-              pageId: i.pageId
+            return new Promise(function (resolve, reject) {
+              requestQueue.sendRequest(function () {
+                return services.findPageInstByVersionId({
+                  appId: appId,
+                  pageId: i.pageId
+                });
+              }).then(resolve).catch(reject);
             });
-          }));
-        case 57:
+          });
+          _context3.next = 59;
+          return Promise.all(requests);
+        case 59:
           data = _context3.sent;
+          // 先清空
+          requests = null;
           pages = getPageDsls(data);
           if (isIncrementalConstruction) {
-            _context3.next = 70;
+            _context3.next = 75;
             break;
           }
           onProgress({
@@ -430,7 +439,7 @@ export var fetchData = /*#__PURE__*/function () {
           });
 
           // 业务组件从被使用才生成改为全部生成
-          _context3.next = 63;
+          _context3.next = 66;
           return services.qryBusiCompPage({
             appIds: [appId],
             appId: appId,
@@ -439,22 +448,29 @@ export var fetchData = /*#__PURE__*/function () {
             pageSize: 999999,
             terminalType: platform
           });
-        case 63:
+        case 66:
           _yield$services$qryBu = _context3.sent;
           itemLists = _yield$services$qryBu.list;
-          _context3.next = 67;
-          return Promise.all(itemLists.map(function (i) {
-            return services.findBusiCompById({
-              busiCompId: i.busiCompId,
-              appId: appId,
-              pageId: lastPageId
+          BusiCompRequest = itemLists.map(function (i) {
+            return new Promise(function (resolve, reject) {
+              requestQueue.sendRequest(function () {
+                return services.findBusiCompById({
+                  busiCompId: i.busiCompId,
+                  appId: appId,
+                  pageId: lastPageId
+                });
+              }).then(resolve).catch(reject);
             });
-          }));
-        case 67:
+          });
+          _context3.next = 71;
+          return Promise.all(BusiCompRequest);
+        case 71:
           busiData = _context3.sent;
-          _context3.next = 77;
+          // 先清空
+          BusiCompRequest = null;
+          _context3.next = 82;
           break;
-        case 70:
+        case 75:
           // busiCompId 过滤重复
           itemHash = {}; // 找到所有页面使用到的 业务组件
           findAllItem(pages, function (item) {
@@ -462,7 +478,7 @@ export var fetchData = /*#__PURE__*/function () {
           }, itemHash);
           _itemLists = Object.keys(itemHash); // 请求所有业务组件的 dsl
           alllBusiComp = ((_incrementalConstruct = incrementalConstruction === null || incrementalConstruction === void 0 ? void 0 : incrementalConstruction.busiCompIds) !== null && _incrementalConstruct !== void 0 ? _incrementalConstruct : []).concat(_itemLists);
-          _context3.next = 76;
+          _context3.next = 81;
           return Promise.all(alllBusiComp.map(function (i) {
             return services.findBusiCompById({
               busiCompId: i,
@@ -470,9 +486,9 @@ export var fetchData = /*#__PURE__*/function () {
               pageId: lastPageId
             });
           }));
-        case 76:
+        case 81:
           busiData = _context3.sent;
-        case 77:
+        case 82:
           // 过滤为空
           busiPages = busiData.filter(Boolean).map(function (i, index) {
             var _i$busiCompVersion;
@@ -545,14 +561,14 @@ export var fetchData = /*#__PURE__*/function () {
           });
           translateNames = {};
           if (!(chinese.length > 0)) {
-            _context3.next = 85;
+            _context3.next = 90;
             break;
           }
-          _context3.next = 84;
+          _context3.next = 89;
           return getTranslateName(appId, chinese, 'UPPER_CAMEL');
-        case 84:
+        case 89:
           translateNames = _context3.sent;
-        case 85:
+        case 90:
           // 翻译业务组件的名字
           for (key = 0; key < busiPages.length; key++) {
             onProgress({
@@ -567,7 +583,7 @@ export var fetchData = /*#__PURE__*/function () {
           }
           pagePathEnglishMapping = {};
           if (!needTranslatePagePathToEnglish) {
-            _context3.next = 98;
+            _context3.next = 103;
             break;
           }
           pagePathEnglishSet = {};
@@ -589,14 +605,14 @@ export var fetchData = /*#__PURE__*/function () {
           });
           pagesTranslateNames = {};
           if (!(pagesChinese.length > 0)) {
-            _context3.next = 96;
+            _context3.next = 101;
             break;
           }
-          _context3.next = 95;
+          _context3.next = 100;
           return getTranslateName(appId, pagesChinese, 'UPPER_CAMEL');
-        case 95:
+        case 100:
           pagesTranslateNames = _context3.sent;
-        case 96:
+        case 101:
           findPageKeyByPageId = function findPageKeyByPageId(id, arrs) {
             for (var _key = 0; _key < arrs.length; _key++) {
               var _arrs$_key;
@@ -622,7 +638,7 @@ export var fetchData = /*#__PURE__*/function () {
               pages[pageKey].pagePath = safeTranslateName;
             }
           }
-        case 98:
+        case 103:
           // 合并页面，生成器那边支持页面类型和业务组件类型
           pageDSLS = [].concat(_toConsumableArray(pages), _toConsumableArray(busiPages));
           getPlatform = function getPlatform(platFormtype) {
@@ -665,7 +681,7 @@ export var fetchData = /*#__PURE__*/function () {
             options: options,
             cleanedTree: cleanedTree
           });
-        case 105:
+        case 110:
         case "end":
           return _context3.stop();
       }

package/es/node/move.d.ts

@@ -2,5 +2,6 @@ export interface MoveConfig {
     target: string;
     outDir: string;
     cwd?: string;
+    plugin?: any;
 }
 export declare function move(moveConfig: MoveConfig): Promise<any>;

package/es/node/move.js

@@ -5,7 +5,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { existsSync, mkdirpSync, readFileSync, readJSONSync, writeFileSync, writeJSONSync } from 'fs-extra';
 import { dirname, isAbsolute, join, relative } from 'path';
 import { getAllImportFiles } from "./babel/getAllImportFiles";
-var copyFileSyncAlias = function copyFileSyncAlias(cwd, from, to) {
+var copyFileSyncAlias = function copyFileSyncAlias(cwd, from, to, plugin) {
   var _context$match;
   // copyFileSync(file, absTarget);
   var context = readFileSync(from, 'utf-8');
@@ -17,6 +17,9 @@ var copyFileSyncAlias = function copyFileSyncAlias(cwd, from, to) {
     var filePath = relative(dirname(from), absolute);
     context = context.replace("@/".concat(source), filePath);
   });
+  if (plugin) {
+    context = plugin(to, context);
+  }
   writeFileSync(to, context, 'utf-8');
 };
 export function move(_x) {
@@ -24,11 +27,11 @@ export function move(_x) {
 }
 function _move() {
   _move = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(moveConfig) {
-    var target, outDir, _moveConfig$cwd, cwd, resolvedTarget, allImportFiles, keys, count, pkg, context;
+    var target, outDir, _moveConfig$cwd, cwd, plugin, resolvedTarget, allImportFiles, keys, count, pkg, context;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          target = moveConfig.target, outDir = moveConfig.outDir, _moveConfig$cwd = moveConfig.cwd, cwd = _moveConfig$cwd === void 0 ? process.cwd() : _moveConfig$cwd;
+          target = moveConfig.target, outDir = moveConfig.outDir, _moveConfig$cwd = moveConfig.cwd, cwd = _moveConfig$cwd === void 0 ? process.cwd() : _moveConfig$cwd, plugin = moveConfig.plugin;
           resolvedTarget = isAbsolute(target) ? target : join(cwd, target);
           if (existsSync(resolvedTarget)) {
             _context.next = 4;
@@ -50,7 +53,7 @@ function _move() {
             var absTarget = isAbsolute(outDir) ? join(outDir, filePath) : join(cwd, outDir, filePath);
             // console.log(`[COPY] 拷贝 ${absTarget}`);
             mkdirpSync(dirname(absTarget));
-            copyFileSyncAlias(cwd, file, absTarget);
+            copyFileSyncAlias(cwd, file, absTarget, plugin);
           });
           console.log("[COPY] \u5171\u62F7\u8D1D\u6587\u4EF6\u6570 ".concat(count));
           pkg = join(cwd, 'package.json');

package/es/requestQueue.d.ts

@@ -0,0 +1,9 @@
+declare class RequestQueue {
+    private maxConcurrent;
+    private pendingRequests;
+    private activeRequests;
+    constructor(maxConcurrent?: number);
+    next(): void;
+    sendRequest(request: any): Promise<unknown>;
+}
+export default RequestQueue;

package/es/requestQueue.js

@@ -0,0 +1,59 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+var RequestQueue = /*#__PURE__*/function () {
+  function RequestQueue() {
+    var maxConcurrent = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 8;
+    _classCallCheck(this, RequestQueue);
+    _defineProperty(this, "maxConcurrent", void 0);
+    _defineProperty(this, "pendingRequests", void 0);
+    _defineProperty(this, "activeRequests", void 0);
+    this.maxConcurrent = maxConcurrent;
+    this.pendingRequests = [];
+    this.activeRequests = 0;
+  }
+  _createClass(RequestQueue, [{
+    key: "next",
+    value: function next() {
+      if (this.pendingRequests.length > 0 && this.activeRequests < this.maxConcurrent) {
+        var _ref = this.pendingRequests.shift(),
+          request = _ref.request,
+          resolve = _ref.resolve,
+          reject = _ref.reject;
+        this.sendRequest(request).then(resolve).catch(reject);
+      }
+    }
+  }, {
+    key: "sendRequest",
+    value: function sendRequest(request) {
+      var _this = this;
+      return new Promise(function (resolve, reject) {
+        if (_this.activeRequests < _this.maxConcurrent) {
+          _this.activeRequests++;
+          request().then(function (response) {
+            _this.activeRequests--;
+            _this.next();
+            resolve(response);
+          }).catch(function (error) {
+            _this.activeRequests--;
+            _this.next();
+            reject(error);
+          });
+        } else {
+          _this.pendingRequests.push({
+            request: request,
+            resolve: resolve,
+            reject: reject
+          });
+          _this.next();
+        }
+      });
+    }
+  }]);
+  return RequestQueue;
+}();
+export default RequestQueue;

package/lib/h5public/src/components/common/PreviewFile/index.tsx

@@ -172,7 +172,7 @@ const PreviewFile: React.FC<PreviewFileProps> = (props) => {
         };
         xhr.onloadend = () => {
           if (xhr.status === 404) {
-            messageApi.error(getLocale('fileNotExist') ?? '文件资源不存在');
+            messageApi.error('文件资源不存在');
             onClose?.();
             reject();
           }
@@ -277,16 +277,12 @@ const PreviewFile: React.FC<PreviewFileProps> = (props) => {
         onLoaded?.(true);
       } else if (!fileInfo?.previewMode) {
         // setResultInfo('当前文件不支持在线预览');
-        messageApi.error(
-          getLocale('fileNotSupportPreview') ?? '当前文件不支持在线预览',
-        );
+        messageApi.error('当前文件不支持在线预览');
         onClose?.();
       }
     } catch (e: any) {
       // setResultInfo(e.resultMsg);
-      messageApi.error(
-        getLocale('fileNotSupportPreview') ?? '当前文件不支持在线预览',
-      );
+      messageApi.error('当前文件不支持在线预览');
       onClose?.();
     } finally {
       setLoading(false);

package/lib/h5public/src/components/factory/package.json

@@ -1,4 +1,4 @@
 {
   "name": "@lingxiteam/factory",
-  "version": "3.7.1"
+  "version": "3.8.1-alpha.12"
 }

package/lib/h5public/src/components/factory/src/BlockSelect/components/CheckBox/index.tsx

@@ -14,7 +14,7 @@ interface CheckBoxProps extends IconProps {
   style?: React.CSSProperties;
   valueKey?: string;
   iconPosition?: string;
-  defaulIcon?: string;
+  defaulIcon?: 'square' | 'circle' | 'custom' | 'none';
   normalIconColor?: any;
   selectIconColor?: any;
 }
@@ -37,15 +37,25 @@ const CheckBox: FC<CheckBoxProps> = (props) => {
   }
   return (
     <div style={myStyle} className={classNames(`${prefixCls}-blockSelect`)}>
-      {iconPosition === 'left' && (
+      {iconPosition === 'left' && defaultIcon !== 'none' && (
         <Icon
           {...iconProps}
           iconPosition={iconPosition}
           defaultIcon={defaultIcon}
         />
       )}
-      <div className={`${prefixCls}-content`}>{children}</div>
-      {iconPosition === 'right' && (
+      <div
+        className={`${prefixCls}-content`}
+        onClick={() =>
+          iconProps?.onChange?.({
+            restItem: iconProps?.restItem,
+            index: iconProps?.index,
+          })
+        }
+      >
+        {children}
+      </div>
+      {iconPosition === 'right' && defaultIcon !== 'none' && (
         <Icon
           {...iconProps}
           iconPosition={iconPosition}

package/lib/h5public/src/components/factory/src/BlockSelect/components/Icon/index.tsx

@@ -45,12 +45,12 @@ const Icon: FC<IconProps> = (props) => {
     name,
   } = props;
 
-  const { compatConfig } = getEngineApis?.() || {};
+  // const { compatConfig } = getEngineApis?.() || {};
 
   const myOnClick = (e: any) => {
-    if (compatConfig?.cmd?.stopPropagation) {
-      e.stopPropagation();
-    }
+    // if (compatConfig?.cmd?.stopPropagation) {
+    //   e.stopPropagation();
+    // }
     if (onChange) {
       onChange({
         restItem,

package/lib/h5public/src/components/factory/src/BlockSelect/index.tsx

@@ -41,12 +41,16 @@ export interface MyBlockSelectProps {
   ) => void;
   iconPosition?: string;
   checkModel?: any;
+
+  /**
+   * @deprecated 废弃
+   */
   status?: string;
   showAllCheck?: boolean;
   showChecked?: boolean;
   actionView?: any;
   actionViewPosition?: string;
-  defaultIcon?: string;
+  defaulIcon?: 'square' | 'circle' | 'custom' | 'none';
   selectedAllAction?: any;
   selectIconColor?: any;
   normalIconColor?: any;
@@ -81,7 +85,8 @@ const BlockSelect = LingxiForwardRef<any, MyBlockSelectProps>((props, ref) => {
     normalImg,
     onChange: uOnChange = () => {},
     iconPosition = 'left',
-    status: myStatus,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    status,
     checkModel,
     actionViewPosition,
     defaultIcon,
@@ -98,13 +103,14 @@ const BlockSelect = LingxiForwardRef<any, MyBlockSelectProps>((props, ref) => {
     closeOnAction = false,
     closeOnTouchOutside = false,
     $$componentItem,
+    disabled,
+    visible,
   } = props;
   const {
     MemoRenderer: { renderer, MemoLoopItem, getLoopItemExtraProps },
     getAppFileUrlByFileCode,
   } = getEngineApis();
   const col = columnNum || 1;
-  const [status, setStatus] = useState<any>(myStatus);
   const [value, setValues] = useState<any[]>();
   const [myIsMultiple, setMyIsMultiple] = useState<any>(false);
   const [myIsChecked, setMyIsChecked] = useState<any>(false);
@@ -120,10 +126,6 @@ const BlockSelect = LingxiForwardRef<any, MyBlockSelectProps>((props, ref) => {
     return [props?.itemKey || 'item', props?.indexKey || 'i'];
   }, []);
 
-  useEffect(() => {
-    setStatus(status);
-  }, [status]);
-
   // 默认值支持对象数组及字符串数组
   useEffect(() => {
     if (Array.isArray(defaultValue) && isUndefined(value)) {
@@ -137,12 +139,12 @@ const BlockSelect = LingxiForwardRef<any, MyBlockSelectProps>((props, ref) => {
       display: 'flex',
       flexDirection: 'column',
     };
-    if (status === '2') {
+    if (visible === false) {
       // 状态隐藏
       style.display = 'none';
     }
     return style;
-  }, [uStyle, status]) as React.CSSProperties;
+  }, [uStyle, visible]) as React.CSSProperties;
 
   const getItemStyle = useCallback(
     (checked, top) => {
@@ -161,7 +163,7 @@ const BlockSelect = LingxiForwardRef<any, MyBlockSelectProps>((props, ref) => {
   );
 
   const onChange = ({ index, restItem }: { index: number; restItem: any }) => {
-    if (status === '3' || restItem?.myBSState === '3') {
+    if (disabled || restItem?.myBSState === '3') {
       // 禁用状态设置无法选中
       return;
     }
@@ -254,16 +256,6 @@ const BlockSelect = LingxiForwardRef<any, MyBlockSelectProps>((props, ref) => {
         realValues,
       ];
     },
-    get visible() {
-      if (status === '2') {
-        return false;
-      }
-      return true;
-    },
-    setVisible: (v: boolean) => {
-      const newStatus = myStatus === '2' ? '1' : myStatus;
-      setStatus(v ? newStatus : '2');
-    },
     setBlockSelectStateData: changeBlockItemState,
     setBlockSelectSelectedData: changeBlockItemSelectedState,
     setBlockSelectHiddenData: changeBlockItemHidden,
@@ -512,7 +504,7 @@ const BlockSelect = LingxiForwardRef<any, MyBlockSelectProps>((props, ref) => {
       ...getLoopItemExtraProps?.(item, i),
     };
 
-    if (swipe && swipeAction?.length && status !== '3') {
+    if (swipe && swipeAction?.length && !disabled) {
       return (
         <MySwipe
           closeOnAction={closeOnAction}

package/lib/h5public/src/components/factory/src/Button/index.tsx

@@ -65,6 +65,7 @@ const MyButton = LingxiForwardRef<unknown, MyButtonProps>((props, ref) => {
   const { run } = useThrottleFn(
     (e) => {
       e.stopPropagation();
+      e.preventDefault();
       onClick && onClick(e);
     },
     {

package/lib/h5public/src/components/factory/src/Card/index.less

@@ -83,37 +83,24 @@
     // padding-bottom: 12px !important;
     position: relative;
     border-radius: 0px !important;
+  // 卡片头部不受padding控制
+    padding: 12px;
   }
 
   .adm-card-header:not(:last-child) {
     border-bottom: solid 1px #f0f0f0;
   }
 
-  .adm-card-body {
-    padding-top: 12px !important;
-    padding-bottom: 12px !important;
-  }
-}
-
-.@{prefixCls}-after381-card {
-  .adm-card-body {
-    padding-top: 0 !important;
-    padding-bottom: 0 !important;
-  }
-  .lcdp-card-body {
-    padding: 0 !important;
-  }
-  .lcdp-card-footer-draw-box {
-    // padding-top: 12 * @hd !important;
-    padding-left: 0 !important;
-    padding-right: 0 !important;
-  }
-
+  // .adm-card-body {
+  //   padding-top: 12px !important;
+  //   padding-bottom: 12px !important;
+  // }
 }
 
-.@{prefixCls}-after381-card-default {
-  .adm-card-body {
-    padding: 0 !important;
+// 简洁的卡片样式
+.@{prefixCls}.@{prefixCls}-after381-card {
+  // 卡片头部不受padding控制
+  .adm-card-header {
+    padding: 12px 12px 0 12px;
   }
-  
 }