@kmkf-fe-packages/kmkf-work-order-service-component 2.2.44-beta.26 → 2.2.44-beta.27

package/dist/esm/LBOrderDetail/detail/OrderInfo.js

@@ -555,6 +555,53 @@ var detailItemListMap = {};
 DETAIL_ITEM_LIST.forEach(function (item) {
   detailItemListMap[item.dataIndex] = item;
 });
+
+/** 全局 tableColumns 缓存，供所有 OrderInfo 复用，减少 queryColumns 请求 */
+var CACHE_TTL_MS = 5 * 60 * 1000; // 5 分钟失效
+var sharedTableColumnsCache = null;
+var fetchColumnsPromise = null;
+function getCachedColumns() {
+  if (!sharedTableColumnsCache) return null;
+  if (Date.now() - sharedTableColumnsCache.timestamp >= CACHE_TTL_MS) return null;
+  return sharedTableColumnsCache.columns;
+}
+function fetchAndCacheColumns() {
+  var cached = getCachedColumns();
+  if (cached) return Promise.resolve(cached);
+  if (fetchColumnsPromise) return fetchColumnsPromise;
+  fetchColumnsPromise = queryColumns().then(function (_ref) {
+    var _data$, _data$$queryInfo;
+    var data = _ref.data;
+    if (data !== null && data !== void 0 && (_data$ = data[0]) !== null && _data$ !== void 0 && (_data$$queryInfo = _data$.queryInfo) !== null && _data$$queryInfo !== void 0 && _data$$queryInfo.length) {
+      try {
+        var newColumns = [];
+        var list = JSON.parse(JSON.parse(data[0].queryInfo));
+        list.forEach(function (item) {
+          if (!item.show) return;
+          if (detailItemListMap[item.dataIndex]) {
+            newColumns.push(detailItemListMap[item.dataIndex]);
+          }
+        });
+        return newColumns;
+      } catch (err) {
+        console.debug('parse Error: ', err);
+        return DETAIL_ITEM_LIST;
+      }
+    }
+    return DETAIL_ITEM_LIST;
+  }).catch(function (err) {
+    console.debug(err);
+    return DETAIL_ITEM_LIST;
+  }).then(function (columns) {
+    sharedTableColumnsCache = {
+      columns: columns,
+      timestamp: Date.now()
+    };
+    fetchColumnsPromise = null;
+    return columns;
+  });
+  return fetchColumnsPromise;
+}
 var renderDetailItem = function renderDetailItem(record, item, effects) {
   var isTable = 'children' in item && item.children;
   var value = isTable ? record[item.dataIndex] : record.main[item.dataIndex];
@@ -566,12 +613,19 @@ var renderDetailItem = function renderDetailItem(record, item, effects) {
     className: styles.detailItemTitle
   }, item.title, "\uFF1A"), /*#__PURE__*/React.createElement("span", null, 'render' in item && item.render ? item.render(value, record, item, effects) : value));
 };
-var tableColumns;
 var OrderInfo = function OrderInfo(props) {
   var _React$useState = React.useState(),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     orderInfo = _React$useState2[0],
     setOrderInfo = _React$useState2[1];
+  // 复用全局缓存，有则用缓存（含 5 分钟有效期），无则走 fetchAndCacheColumns 拉取并写入缓存
+  var _React$useState3 = React.useState(function () {
+      var _getCachedColumns;
+      return (_getCachedColumns = getCachedColumns()) !== null && _getCachedColumns !== void 0 ? _getCachedColumns : [];
+    }),
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    tableColumns = _React$useState4[0],
+    setTableColumns = _React$useState4[1];
   React.useEffect(function () {
     if (props.id) {
       queryInstallationRepairDetail(props.id).then(function (res) {
@@ -594,31 +648,9 @@ var OrderInfo = function OrderInfo(props) {
     return;
   }, [props.id]);
   React.useEffect(function () {
-    if (!tableColumns || tableColumns.length === 0) {
-      queryColumns().then(function (_ref) {
-        var _data$, _data$$queryInfo;
-        var data = _ref.data;
-        if (data !== null && data !== void 0 && (_data$ = data[0]) !== null && _data$ !== void 0 && (_data$$queryInfo = _data$.queryInfo) !== null && _data$$queryInfo !== void 0 && _data$$queryInfo.length) {
-          try {
-            var newColumns = [];
-            var list = JSON.parse(JSON.parse(data[0].queryInfo));
-            list.forEach(function (item) {
-              if (!item.show) return;
-              if (detailItemListMap[item.dataIndex]) {
-                newColumns.push(detailItemListMap[item.dataIndex]);
-              }
-            });
-            tableColumns = newColumns;
-          } catch (err) {
-            console.debug('parse Error: ', err);
-          }
-        } else {
-          tableColumns = DETAIL_ITEM_LIST;
-        }
-      }).catch(console.debug);
-    }
+    fetchAndCacheColumns().then(setTableColumns);
   }, []);
-  return orderInfo && tableColumns ? /*#__PURE__*/React.createElement("div", null, tableColumns.map(function (item) {
+  return orderInfo && tableColumns.length > 0 ? /*#__PURE__*/React.createElement("div", null, tableColumns.map(function (item) {
     return renderDetailItem(orderInfo, item, {
       shopList: props.shopList
     });

package/dist/esm/LBOrderDetail/index.js

@@ -9,7 +9,6 @@ import React, { useState } from 'react';
 import { CloseOutlined } from '@ant-design/icons';
 import LBOrderDetail from "./detail/index";
 import { useWindowSize } from '@kmkf-fe-packages/kmkf-utils';
-console.log("\uD83D\uDE80 ~ index.tsx:7 ~ useWindowSize:", useWindowSize);
 export * from "./detail/types";
 export * from "./detail/OrderInfo";
 export * from "./detail/ServiceProgress";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.2.44-beta.26",
+  "version": "2.2.44-beta.27",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "37d9544f0ff311b4cd7bfe75aaeb6bba8a11df67",
+  "gitHead": "6ac1712e67311b202e26b19f51cfcea9db2bd2c4",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }