xh-lab-rc 0.17.2 → 0.17.3

package/dist/LabDGTreeSelect/index.d.ts

@@ -9,6 +9,7 @@ interface ILabDGTreeSelectProps {
     onSelect?: (value: any, node: any) => void;
     selectDisabledProp?: string;
     selectDisabledArr?: string[];
+    showAll?: boolean;
 }
-declare const LabDGTreeSelect: ({ defaultValue, placeholder, style, treeData, dropdownStyle, onSelect, selectDisabledProp, selectDisabledArr, }: ILabDGTreeSelectProps) => React.JSX.Element;
+declare const LabDGTreeSelect: ({ defaultValue, placeholder, style, treeData, dropdownStyle, onSelect, selectDisabledProp, selectDisabledArr, showAll, }: ILabDGTreeSelectProps) => React.JSX.Element;
 export default LabDGTreeSelect;

package/dist/LabDGTreeSelect/index.js

@@ -31,7 +31,9 @@ var LabDGTreeSelect = function LabDGTreeSelect(_ref) {
     _ref$selectDisabledPr = _ref.selectDisabledProp,
     selectDisabledProp = _ref$selectDisabledPr === void 0 ? 'NODE_TYPE' : _ref$selectDisabledPr,
     _ref$selectDisabledAr = _ref.selectDisabledArr,
-    selectDisabledArr = _ref$selectDisabledAr === void 0 ? [] : _ref$selectDisabledAr;
+    selectDisabledArr = _ref$selectDisabledAr === void 0 ? [] : _ref$selectDisabledAr,
+    _ref$showAll = _ref.showAll,
+    showAll = _ref$showAll === void 0 ? false : _ref$showAll;
   var _useState = useState(defaultValue || undefined),
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
@@ -54,7 +56,7 @@ var LabDGTreeSelect = function LabDGTreeSelect(_ref) {
     return data.map(function (item) {
       // NODE_TYPE：'1'检验专业组，'2'管理专业组，'4'科室
       // 如果子节点非科室、专业组，就清空
-      var clearChild = item.CHILDREN && item.CHILDREN.length > 0 && ['1', '2', '4'].indexOf(item.CHILDREN[0].NODE_TYPE) < 0;
+      var clearChild = !showAll && item.CHILDREN && item.CHILDREN.length > 0 && ['1', '2', '4'].indexOf(item.CHILDREN[0].NODE_TYPE) < 0;
       var SOURCE_ID = item.SOURCE_ID,
         NAME = item.NAME,
         NODE_TYPE = item.NODE_TYPE,

package/dist/LabFilePreview/index.js

@@ -6,7 +6,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
  * @Author: xqy
  * @Date: 2024-04-10 11:04:12
  * @LastEditors: xqy
- * @LastEditTime: 2024-11-28 17:42:47
+ * @LastEditTime: 2024-12-24 10:50:48
  * @Description: 文件预览（支持pdf切换预览）
  */
 import { LeftOutlined, RightOutlined, RotateLeftOutlined, RotateRightOutlined, ZoomInOutlined, ZoomOutOutlined } from '@ant-design/icons';
@@ -98,7 +98,7 @@ var LabFilePreview = function LabFilePreview(props) {
   var carouselClick = function carouselClick(type) {
     setScale(1); //重置初始的缩放比例
     setRotatinNum(0); //重置初始的缩放比例
-    if (type === 'lt') {
+    if (type === 'l') {
       //向左切换
       if (curIndex === 0) {
         //当前的索引为0,获取最后一张图片
@@ -148,7 +148,7 @@ var LabFilePreview = function LabFilePreview(props) {
             updatedList[curIndex].roteAngle = newRotateNum * 90;
             setList(updatedList);
             setRotatinNum(newRotateNum);
-            getRotateAngle === null || getRotateAngle === void 0 || getRotateAngle(newRotateNum * 90);
+            getRotateAngle === null || getRotateAngle === void 0 || getRotateAngle(newRotateNum * 90, direction);
             // //旋转之后,利用canvas生成新的图片(formData类型,供传参使用)
             // if (isCanvasImg) {
             //   const newFiles = await labCanvasToFile(canvasRef, {
@@ -208,7 +208,7 @@ var LabFilePreview = function LabFilePreview(props) {
     }
   }, [imgList]);
   useEffect(function () {
-    setCurIndex(curImgIndex);
+    setCurIndex(curImgIndex !== null && curImgIndex !== void 0 ? curImgIndex : 0);
   }, [curImgIndex]);
   useEffect(function () {
     var newBtns = _toConsumableArray(footerBtns);
@@ -256,14 +256,14 @@ var LabFilePreview = function LabFilePreview(props) {
   }, /*#__PURE__*/React.createElement(LeftOutlined, {
     className: "footer-icon",
     onClick: function onClick() {
-      return carouselClick('lt');
+      return carouselClick('l');
     }
   }), /*#__PURE__*/React.createElement("span", {
     className: "page-text"
   }, curIndex + 1, "/", imgList === null || imgList === void 0 ? void 0 : imgList.length), /*#__PURE__*/React.createElement(RightOutlined, {
     className: "footer-icon",
     onClick: function onClick() {
-      return carouselClick('rt');
+      return carouselClick('r');
     },
     title: "\u4E0B\u4E00\u5F20"
   })), (imgList === null || imgList === void 0 ? void 0 : imgList.length) > 1 && /*#__PURE__*/React.createElement(Divider, {

package/dist/LabGroupTree/index.js

@@ -8,7 +8,7 @@ var _excluded = ["treeData", "GBeforeIcon", "showIcon", "isShowNum", "isCustomTr
  * @Author: xqy
  * @Date: 2024-03-18 16:23:10
  * @LastEditors: xqy
- * @LastEditTime: 2024-12-13 15:19:51
+ * @LastEditTime: 2025-01-11 10:08:02
  * @Description:专业组树形
  */
 import { Iconfont } from "../components";
@@ -64,7 +64,11 @@ var LabGroupTree = function LabGroupTree(_ref) {
         className: "num"
       }, NUM)))));
     } else {
-      return childTitleNode === null || childTitleNode === void 0 ? void 0 : childTitleNode(nodeData);
+      return childTitleNode ? childTitleNode === null || childTitleNode === void 0 ? void 0 : childTitleNode(nodeData) : /*#__PURE__*/React.createElement("div", {
+        className: "tree-item-text tree-first"
+      }, /*#__PURE__*/React.createElement("span", {
+        className: "txt"
+      }, NAME));
     }
   };
 

package/dist/LabGroupTree/style.less

@@ -2,6 +2,7 @@
   width: 100%;
   height: 100%;
   background-color: #fff;
+  overflow-y: auto;
 
   .tree-first {
     width: calc(100% - 1rem);
@@ -22,23 +23,11 @@
       font-size: 13px;
       font-weight: normal;
       overflow: hidden;
-
-      .txt {
-        width: 100%;
-        display: inline-block;
-        padding: 0 4px;
-        max-width: 85%;
-        height: 24px;
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        box-sizing: border-box;
-      }
+      justify-content: space-between;
     }
 
     .sufix {
-      position: absolute;
-      right: 0;
+      margin-right: 4px;
     }
 
     .num {
@@ -46,6 +35,18 @@
     }
   }
 
+  .txt {
+    width: 100%;
+    display: inline-block;
+    padding: 0 4px;
+    max-width: 85%;
+    height: 24px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    box-sizing: border-box;
+  }
+
   .ant-tree-title {
     width: 100% !important;
   }

package/dist/LabGroupTree/typing.d.ts

@@ -15,7 +15,7 @@ export interface IGtreeProps {
     showIcon?: boolean;
     /**异步加载数据 */
     loadData?: (node: any) => Promise<any>;
-    /**构造除检/管专业组的标题样式 */
+    /**子节点标题自定义 */
     childTitleNode?: (node: any) => React.ReactNode;
     /**专业组前的图标*/
     GBeforeIcon?: (type: string) => React.ReactNode;

package/dist/LabPdfView/index.js

@@ -61,7 +61,7 @@ var LabPdfView = function LabPdfView(_ref) {
   }
   // 加上书签id，和tree一致
   function addItemId(t, j) {
-    t.forEach(function (e, i) {
+    t === null || t === void 0 || t.forEach(function (e, i) {
       e.id = j + '-' + i;
       if (e.items.length > 0) {
         addItemId(e.items, e.id);

package/dist/LabPdfViewMobile/index.js

@@ -65,7 +65,7 @@ var LabPdfViewMobile = function LabPdfViewMobile(_ref) {
 
   // 编排树形id
   function addItemId(t, j) {
-    t.forEach(function (e, i) {
+    t === null || t === void 0 || t.forEach(function (e, i) {
       e.id = j + '-' + i;
       if (e.items.length > 0) {
         addItemId(e.items, e.id);

package/dist/LabPictureCarousel/index.d.ts

@@ -7,7 +7,7 @@ interface IndexProps {
     visible?: boolean;
     isShowTitle?: boolean;
     fileField?: object;
-    getRotateAngle?: (Angle?: number, direction?: string) => void;
+    getRotateAngle?: (direction?: string, curFile?: object) => void;
 }
 declare const LabPictureCarousel: FC<IndexProps>;
 export default LabPictureCarousel;

package/dist/LabPictureCarousel/index.js

@@ -1,14 +1,16 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-/*
- * @Author: xqy
- * @Date: 2024-04-10 11:04:12
- * @LastEditors: xqy
- * @LastEditTime: 2024-11-28 17:44:24
- * @Description:图片轮播切换组件（支持pdf切换预览）
+/*
+ * @Author: xqy
+ * @Date: 2024-04-10 11:04:12
+ * @LastEditors: xqy
+ * @LastEditTime: 2024-12-30 10:58:58
+ * @Description:图片轮播切换组件（支持pdf切换预览）
  */
+// import { throttle } from '@/utils/utils';
 import { CloseOutlined, LeftOutlined, RightOutlined, RotateLeftOutlined, RotateRightOutlined, ZoomInOutlined, ZoomOutOutlined } from '@ant-design/icons';
 import { Divider } from 'antd';
 import cn from 'classnames';
@@ -49,10 +51,36 @@ var LabPictureCarousel = function LabPictureCarousel(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     rotatinNum = _useState10[0],
     setRotatinNum = _useState10[1]; //旋转次数
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    dragging = _useState12[0],
+    setDragging = _useState12[1]; //拖拽状态
+  var _useState13 = useState({
+      left: 'auto',
+      top: 'auto'
+    }),
+    _useState14 = _slicedToArray(_useState13, 2),
+    position = _useState14[0],
+    setPosition = _useState14[1]; // 用于存储图片位置的状态
+  var _useState15 = useState({
+      left: 0,
+      top: 0
+    }),
+    _useState16 = _slicedToArray(_useState15, 2),
+    initialPosition = _useState16[0],
+    setInitialPosition = _useState16[1]; //(被点击元素相对于页面偏移量))
+  var _useState17 = useState({
+      x: 0,
+      y: 0
+    }),
+    _useState18 = _slicedToArray(_useState17, 2),
+    initialMousePosition = _useState18[0],
+    setInitialMousePosition = _useState18[1]; //鼠标按下的坐标
+
   var canvasRef = useRef(null);
 
   //底部操作按钮
-  var _useState11 = useState([{
+  var _useState19 = useState([{
       type: 'enlarge',
       typeName: '放大(+)',
       icon: /*#__PURE__*/React.createElement(ZoomInOutlined, {
@@ -83,13 +111,12 @@ var LabPictureCarousel = function LabPictureCarousel(props) {
       }),
       disabled: false
     }]),
-    _useState12 = _slicedToArray(_useState11, 2),
-    footerBtns = _useState12[0],
-    setFooterBtns = _useState12[1];
+    _useState20 = _slicedToArray(_useState19, 2),
+    footerBtns = _useState20[0],
+    setFooterBtns = _useState20[1];
 
   /**鼠标滚轮实现图片的放大缩小 */
   var handleWheel = function handleWheel(event) {
-    // event.preventDefault() //阻止默认的滚动行为，防止浏览器默认进行页面滚动
     var scaleChange = event.deltaY > 0 ? -0.1 : 0.1;
     //计算缩放比例,限制缩放比例在（0.5到4之间），防止过大或过小
     var newScale = Math.min(Math.max(0.2, scale + scaleChange), 4);
@@ -169,7 +196,8 @@ var LabPictureCarousel = function LabPictureCarousel(props) {
             updatedList[curIndex].roteAngle = newRotateNum * 90;
             setList(updatedList);
             setRotatinNum(newRotateNum);
-            getRotateAngle(newRotateNum * 90, direction, direction);
+            console.log('updatedList', updatedList[curIndex], curIndex);
+            getRotateAngle === null || getRotateAngle === void 0 || getRotateAngle(direction, updatedList[curIndex]);
             //旋转之后,利用canvas生成新的图片(formData类型,供传参使用)
             // if (isCanvasImg) {
             //   const newFiles = await labCanvasToFile(canvasRef, {
@@ -178,7 +206,7 @@ var LabPictureCarousel = function LabPictureCarousel(props) {
             //   });
             //   getRotateImg?.(newFiles);
             // }
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }
@@ -189,6 +217,44 @@ var LabPictureCarousel = function LabPictureCarousel(props) {
     };
   }();
 
+  //图片拖拽（鼠标按下，开始拖拽）
+  var handleMouseDown = function handleMouseDown(event) {
+    event.preventDefault();
+    setDragging(true);
+    // 鼠标按下开始坐标
+    setInitialMousePosition({
+      x: event.clientX,
+      y: event.clientY
+    });
+    //被点击元素相对于页面的偏移量
+    setInitialPosition({
+      left: event.currentTarget.offsetLeft,
+      top: event.currentTarget.offsetTop
+    });
+  };
+
+  //图片拖拽(拖拽移动中)
+  var handleMouseMove = function handleMouseMove(event) {
+    if (dragging) {
+      //计算拖拽移动距离
+      var dx = event.clientX - initialMousePosition.x;
+      var dy = event.clientY - initialMousePosition.y;
+      setPosition({
+        left: "".concat(initialPosition.left + dx, "px"),
+        top: "".concat(initialPosition.top + dy, "px")
+      });
+    }
+  };
+
+  // 图片拖拽（鼠标松开，结束拖拽）
+  var handleMouseUp = function handleMouseUp() {
+    setDragging(false);
+    setPosition({
+      left: 'auto',
+      top: 'auto'
+    });
+  };
+
   //底部按钮点击事件(enlarge - 放大，narrow - 缩小，turnLeft - 左转， turnRight - 右转)
   var clickHandle = function clickHandle(type) {
     switch (type) {
@@ -217,14 +283,14 @@ var LabPictureCarousel = function LabPictureCarousel(props) {
         var _i$filePath, _i$filePath2;
         var name = i[fileName] ? i[fileName] : (_i$filePath = i[filePath]) === null || _i$filePath === void 0 ? void 0 : _i$filePath.split('/').pop();
         var type = (_i$filePath2 = i[filePath]) === null || _i$filePath2 === void 0 ? void 0 : _i$filePath2.substring(i[filePath].lastIndexOf('.') + 1);
-        return {
+        return _objectSpread(_objectSpread({}, i), {}, {
           fileType: type === null || type === void 0 ? void 0 : type.toLowerCase(),
           filePath: i[filePath] + '?v=' + Date.now(),
           // 加时间戳：解决图片地址没改，造成浏览器缓存，图片不更新的问题。
           fileName: name,
           scale: 1,
           roteAngle: 0
-        };
+        });
       });
       setList(arr);
 
@@ -285,19 +351,27 @@ var LabPictureCarousel = function LabPictureCarousel(props) {
     className: cn('imgContainer', list[curIndex].fileType === 'pdf' && 'pdfStyle')
   }, list[curIndex].fileType === 'pdf' ? /*#__PURE__*/React.createElement(LabPdf, {
     src: list[curIndex].filePath
-  }) : /*#__PURE__*/React.createElement("img", {
+  }) : /*#__PURE__*/React.createElement("div", {
+    className: "img-part"
+  }, /*#__PURE__*/React.createElement("img", {
     style: {
       maxWidth: '100%',
       maxHeight: '100%',
-      transform: "rotate(".concat(list[curIndex].roteAngle, "deg) scale3d(").concat(list[curIndex].scale, ", ").concat(list[curIndex].scale, ", 1)"),
-      transition: 'transform 0.25s ease',
+      transform: "rotate(".concat(list[curIndex].roteAngle, "deg) \n                                    scale3d(").concat(list[curIndex].scale, ", ").concat(list[curIndex].scale, ", 1)"),
+      transition: 'transform ease-in-out 0.2s',
       // 添加平滑的缩放过渡效果
-      cursor: 'grab'
+      cursor: dragging ? 'grabbing' : 'grab',
+      position: 'absolute',
+      left: "".concat(position === null || position === void 0 ? void 0 : position.left),
+      top: "".concat(position === null || position === void 0 ? void 0 : position.top)
     },
     src: list[curIndex].filePath,
     onWheel: handleWheel,
-    key: list[curIndex].filePath
-  }))), list.length > 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
+    key: list[curIndex].filePath,
+    onMouseDown: handleMouseDown,
+    onMouseMove: handleMouseMove,
+    onMouseUp: handleMouseUp
+  })))), list.length > 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", {
     onClick: function onClick() {
       return carouselClick('lt');
     },

package/dist/LabPictureCarousel/style.less

@@ -64,6 +64,16 @@
         align-items: center;
         justify-content: center;
         height: 100%;
+        width: 100%;
+
+        .img-part {
+          width: 100%;
+          height: 100%;
+          position: relative;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+        }
 
         img {
           height: 100vh;

package/dist/components/Iconfont/index.js

@@ -1,10 +1,3 @@
-/*
- * @Author: xqy
- * @Date: 2024-04-01 14:07:41
- * @LastEditors: xqy
- * @LastEditTime: 2024-12-12 09:57:48
- * @Description: 
- */
 import { createFromIconfontCN } from '@ant-design/icons';
 var ICONFONT_URL = '//at.alicdn.com/t/c/font_4487114_sryj061ptfs.js';
 // 生产环境使用本地的iconfont.js,开发环境使用线上环境以方便开发

package/dist/index.d.ts

@@ -1,13 +1,13 @@
 export { default as LabAltimeter } from './LabAltimeter';
 export { default as LabDGTreeSelect } from './LabDGTreeSelect';
 export { default as LabFilePreview } from './LabFilePreview';
-export { default as LabGTreeSelect } from './LabGTreeSelect';
 export { default as LabGroupTree } from './LabGroupTree';
 export * from './LabGroupTree/typing';
+export { default as LabGTreeSelect } from './LabGTreeSelect';
 export { default as LabMultipleSelect } from './LabMultipleSelect';
-export { default as LabPSwitchPreview } from './LabPSwitchPreview';
 export { default as LabPdf } from './LabPdf';
 export { default as LabPdfPrint } from './LabPdfPrint';
 export { default as LabPdfView } from './LabPdfView';
 export { default as LabPdfViewMobile } from './LabPdfViewMobile';
 export { default as LabPictureCarousel } from './LabPictureCarousel';
+export { default as LabPSwitchPreview } from './LabPSwitchPreview';

package/dist/index.js

@@ -1,13 +1,13 @@
 export { default as LabAltimeter } from "./LabAltimeter";
 export { default as LabDGTreeSelect } from "./LabDGTreeSelect";
 export { default as LabFilePreview } from "./LabFilePreview";
-export { default as LabGTreeSelect } from "./LabGTreeSelect";
 export { default as LabGroupTree } from "./LabGroupTree";
 export * from "./LabGroupTree/typing";
+export { default as LabGTreeSelect } from "./LabGTreeSelect";
 export { default as LabMultipleSelect } from "./LabMultipleSelect";
-export { default as LabPSwitchPreview } from "./LabPSwitchPreview";
 export { default as LabPdf } from "./LabPdf";
 export { default as LabPdfPrint } from "./LabPdfPrint";
 export { default as LabPdfView } from "./LabPdfView";
 export { default as LabPdfViewMobile } from "./LabPdfViewMobile";
-export { default as LabPictureCarousel } from "./LabPictureCarousel";
+export { default as LabPictureCarousel } from "./LabPictureCarousel";
+export { default as LabPSwitchPreview } from "./LabPSwitchPreview";

package/dist/utils/utils.d.ts

@@ -23,4 +23,5 @@ declare function stringToByte(str: any): any[];
  * @param files  //原图片信息
  */
 declare const labCanvasToFile: (canvasRef: any, files: any) => Promise<unknown>;
-export { LabBase64ToFile, Uint8ArrayToString, byteToString, formatDate, labCanvasToFile, stringToByte, };
+declare const treeToArray: (tree: any) => any;
+export { LabBase64ToFile, Uint8ArrayToString, byteToString, formatDate, labCanvasToFile, stringToByte, treeToArray, };

package/dist/utils/utils.js

@@ -1,3 +1,5 @@
+import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+var _excluded = ["CHILDREN"];
 import { message } from 'antd';
 
 /**
@@ -145,4 +147,11 @@ var labCanvasToFile = function labCanvasToFile(canvasRef, files) {
     };
   });
 };
-export { LabBase64ToFile, Uint8ArrayToString, byteToString, formatDate, labCanvasToFile, stringToByte };
+var treeToArray = function treeToArray(tree) {
+  return tree.reduce(function (res, item) {
+    var CHILDREN = item.CHILDREN,
+      i = _objectWithoutProperties(item, _excluded);
+    return res.concat(i, CHILDREN && CHILDREN.length ? treeToArray(CHILDREN) : []);
+  }, []);
+};
+export { LabBase64ToFile, Uint8ArrayToString, byteToString, formatDate, labCanvasToFile, stringToByte, treeToArray };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xh-lab-rc",
-  "version": "0.17.2",
+  "version": "0.17.3",
   "description": " A react library for xinhelab",
   "license": "MIT",
   "module": "dist/index.js",