yootd 0.2.1 → 0.2.3

package/dist/areas/index.js

@@ -17,6 +17,8 @@ export var Areas = function Areas(_ref) {
     placeholder = _ref$placeholder === void 0 ? ['请选择学校', '请选择校区', '请选择楼栋', '请选择楼层', '请选择房间'] : _ref$placeholder,
     _ref$level = _ref.level1,
     level1 = _ref$level === void 0 ? true : _ref$level,
+    _ref$level2 = _ref.level5,
+    level5 = _ref$level2 === void 0 ? true : _ref$level2,
     areaType = _ref.areaType,
     areaSubType = _ref.areaSubType,
     _ref$disabled = _ref.disabled,
@@ -117,7 +119,7 @@ export var Areas = function Areas(_ref) {
           }
         });
       },
-      enabled: level4Value != null
+      enabled: level4Value != null && level5
     }),
     level5AreaData = _useQuery5.data;
   // 将level1位置树处理成下拉框
@@ -170,6 +172,18 @@ export var Areas = function Areas(_ref) {
       };
     });
   }, [level5AreaData]);
+  // 搜索框宽度
+  var searchWidth = useMemo(function () {
+    if (level1 && level5) {
+      return '20%';
+    } else if (level1 && !level5) {
+      return '25%';
+    } else if (!level1 && level5) {
+      return '25%';
+    } else {
+      return '33.3%';
+    }
+  }, [level1, level5]);
   // level1选择事件
   var changeLevel1Select = function changeLevel1Select(value) {
     setLevel1Value(value);
@@ -253,7 +267,7 @@ export var Areas = function Areas(_ref) {
     showSearch: showSearch,
     optionFilterProp: "label",
     style: {
-      width: level1 ? '20%' : '25%',
+      width: searchWidth,
       height: style === null || style === void 0 ? void 0 : style.height
     },
     options: level1AreaOptions,
@@ -267,7 +281,7 @@ export var Areas = function Areas(_ref) {
     showSearch: showSearch,
     optionFilterProp: "label",
     style: {
-      width: level1 ? '20%' : '25%',
+      width: searchWidth,
       height: style === null || style === void 0 ? void 0 : style.height
     },
     options: level2AreaOptions,
@@ -281,7 +295,7 @@ export var Areas = function Areas(_ref) {
     showSearch: showSearch,
     optionFilterProp: "label",
     style: {
-      width: level1 ? '20%' : '25%',
+      width: searchWidth,
       height: style === null || style === void 0 ? void 0 : style.height
     },
     options: level3AreaOptions,
@@ -291,24 +305,24 @@ export var Areas = function Areas(_ref) {
   }), /*#__PURE__*/React.createElement(Select, {
     value: level4Value,
     allowClear: allowClear,
-    className: "".concat(mb.b('areas-select')),
+    className: "".concat(level5 ? mb.b('areas-select') : ''),
     showSearch: showSearch,
     optionFilterProp: "label",
     style: {
-      width: level1 ? '20%' : '25%',
+      width: searchWidth,
       height: style === null || style === void 0 ? void 0 : style.height
     },
     options: level4AreaOptions,
     onChange: changeLevel4Select,
     placeholder: placeholder === null || placeholder === void 0 ? void 0 : placeholder[3],
     disabled: disabled
-  }), /*#__PURE__*/React.createElement(Select, {
+  }), level5 && /*#__PURE__*/React.createElement(Select, {
     value: level5Value,
     allowClear: allowClear,
     showSearch: showSearch,
     optionFilterProp: "label",
     style: {
-      width: level1 ? '20%' : '25%',
+      width: searchWidth,
       height: style === null || style === void 0 ? void 0 : style.height
     },
     options: level5AreaOptions,

package/dist/areas/types/types.d.ts

@@ -1,40 +1,41 @@
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-type SchoolProps = {
-  level1?: boolean;
-  areaType?: number;
-  areaSubType?: number;
-  style?: React.CSSProperties;
-  showSearch?: boolean;
-  disabled?: boolean;
-  value?: {
-    level1?: number;
-    level2?: number;
-    level3?: number;
-    level4?: number;
-    level5?: number;
-  };
-  onChange?: (record: {
-    level1?: number;
-    level2?: number;
-    level3?: number;
-    level4?: number;
-    level5?: number;
-  }) => void;
-  allowClear?: boolean;
-  placeholder?: string[];
-};
-// 查询位置接口返回的数据类型
-export interface IareaItem {
-  areaId: number;
-  areaLevel: number;
-  areaName: string;
-  areaType: number;
-}
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+type SchoolProps = {
+  level1?: boolean;
+  level5?: boolean;
+  areaType?: number;
+  areaSubType?: number;
+  style?: React.CSSProperties;
+  showSearch?: boolean;
+  disabled?: boolean;
+  value?: {
+    level1?: number;
+    level2?: number;
+    level3?: number;
+    level4?: number;
+    level5?: number;
+  };
+  onChange?: (record: {
+    level1?: number;
+    level2?: number;
+    level3?: number;
+    level4?: number;
+    level5?: number;
+  }) => void;
+  allowClear?: boolean;
+  placeholder?: string[];
+};
+// 查询位置接口返回的数据类型
+export interface IareaItem {
+  areaId: number;
+  areaLevel: number;
+  areaName: string;
+  areaType: number;
+}

package/dist/areas-treeSelect/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["depth", "areaType", "areaSubType", "treeCheckable", "selectable", "treeDefaultExpandedLevel"];
+var _excluded = ["level1", "depth", "areaType", "areaSubType", "treeCheckable", "selectable", "treeDefaultExpandedLevel"];
 import { useQuery } from '@tanstack/react-query';
 import { TreeSelect } from 'antd';
 import React, { useMemo, useState } from 'react';
@@ -11,7 +11,10 @@ import { useBem } from "../hooks/useBem";
 import { useRequest } from "../hooks/useRequest";
 import "./index.scss";
 export var AreasTreeSelect = function AreasTreeSelect(_ref) {
-  var _ref$depth = _ref.depth,
+  var _areasTreeOptions$;
+  var _ref$level = _ref.level1,
+    level1 = _ref$level === void 0 ? true : _ref$level,
+    _ref$depth = _ref.depth,
     depth = _ref$depth === void 0 ? 5 : _ref$depth,
     areaType = _ref.areaType,
     areaSubType = _ref.areaSubType,
@@ -67,7 +70,7 @@ export var AreasTreeSelect = function AreasTreeSelect(_ref) {
     return handleAreasTree((areasTreeData === null || areasTreeData === void 0 ? void 0 : areasTreeData.content) || []);
   }, [areasTreeData]);
   var tProps = {
-    treeData: areasTreeOptions,
+    treeData: level1 ? areasTreeOptions : areasTreeOptions === null || areasTreeOptions === void 0 || (_areasTreeOptions$ = areasTreeOptions[0]) === null || _areasTreeOptions$ === void 0 ? void 0 : _areasTreeOptions$.children,
     treeCheckable: treeCheckable,
     showCheckedStrategy: treeCheckable ? SHOW_PARENT : undefined,
     placeholder: '请选择位置',

package/dist/areas-treeSelect/types/type.d.ts

@@ -29,6 +29,7 @@ export interface AreasTreeOptions {
 }
 // 空间树选择器props
 export interface AreasTreeSelectProps extends TreeSelectProps {
+  level1?: boolean; // 是否显示第一级
   depth?: number; // 树节点深度，不传表示到第五级
   areaType?: number; // 筛选楼类型
   areaSubType?: number; // 筛选楼类型

package/package.json

@@ -1,91 +1,91 @@
-{
-  "name": "yootd",
-  "version": "0.2.1",
-  "description": "基于 Antd 二次开发的组件库",
-  "license": "MIT",
-  "module": "dist/index.js",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "father build",
-    "build:watch": "father dev",
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:preview": "dumi preview",
-    "doctor": "father doctor",
-    "lint": "npm run lint:es && npm run lint:css",
-    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
-    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
-    "prepare": "husky install && dumi setup",
-    "prepublishOnly": "father doctor && npm run build",
-    "start": "npm run dev"
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "lint-staged": {
-    "*.{md,json}": [
-      "prettier --write --no-error-on-unmatched-pattern"
-    ],
-    "*.{css,less}": [
-      "stylelint --fix",
-      "prettier --write"
-    ],
-    "*.{js,jsx}": [
-      "eslint --fix",
-      "prettier --write"
-    ],
-    "*.{ts,tsx}": [
-      "eslint --fix",
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@babel/runtime": "^7.26.9"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^17.1.2",
-    "@commitlint/config-conventional": "^17.1.0",
-    "@types/lodash": "^4.17.12",
-    "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.0",
-    "@umijs/lint": "^4.0.0",
-    "dumi": "^2.3.0",
-    "dumi-theme-antd": "^0.4.2",
-    "eslint": "^8.23.0",
-    "father": "^4.1.0",
-    "husky": "^8.0.1",
-    "lint-staged": "^13.0.3",
-    "prettier": "^2.7.1",
-    "prettier-plugin-organize-imports": "^3.0.0",
-    "prettier-plugin-packagejson": "^2.2.18",
-    "sass": "^1.80.0",
-    "stylelint": "^14.9.1"
-  },
-  "peerDependencies": {
-    "@dnd-kit/core": ">=6.1.0",
-    "@dnd-kit/modifiers": ">=7.0.0",
-    "@dnd-kit/sortable": ">=8.0.0",
-    "@dnd-kit/utilities": ">=3.2.2",
-    "@tanstack/react-query": ">=5.59.15",
-    "@tensorflow-models/pose-detection": ">=2.1.3",
-    "@tensorflow/tfjs": ">=4.22.0",
-    "@vladmandic/face-api": ">=1.7.14",
-    "@xyflow/react": ">=12.3.3",
-    "antd": ">=5.21.4",
-    "axios": ">=1.7.7",
-    "dayjs": ">=1.11.13",
-    "lodash": ">=4.17.21",
-    "react": ">=18.0.0",
-    "react-dom": ">=18.0.0",
-    "yootd-webrtc-sdk": ">=1.0.1"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "authors": []
-}
+{
+  "name": "yootd",
+  "version": "0.2.3",
+  "description": "基于 Antd 二次开发的组件库",
+  "license": "MIT",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "father build",
+    "build:watch": "father dev",
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:preview": "dumi preview",
+    "doctor": "father doctor",
+    "lint": "npm run lint:es && npm run lint:css",
+    "lint:css": "stylelint \"{src,test}/**/*.{css,less}\"",
+    "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
+    "prepare": "husky install && dumi setup",
+    "prepublishOnly": "father doctor && npm run build",
+    "start": "npm run dev"
+  },
+  "commitlint": {
+    "extends": [
+      "@commitlint/config-conventional"
+    ]
+  },
+  "lint-staged": {
+    "*.{md,json}": [
+      "prettier --write --no-error-on-unmatched-pattern"
+    ],
+    "*.{css,less}": [
+      "stylelint --fix",
+      "prettier --write"
+    ],
+    "*.{js,jsx}": [
+      "eslint --fix",
+      "prettier --write"
+    ],
+    "*.{ts,tsx}": [
+      "eslint --fix",
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@babel/runtime": "^7.26.9"
+  },
+  "devDependencies": {
+    "@commitlint/cli": "^17.1.2",
+    "@commitlint/config-conventional": "^17.1.0",
+    "@types/lodash": "^4.17.12",
+    "@types/react": "^18.0.0",
+    "@types/react-dom": "^18.0.0",
+    "@umijs/lint": "^4.0.0",
+    "dumi": "^2.3.0",
+    "dumi-theme-antd": "^0.4.2",
+    "eslint": "^8.23.0",
+    "father": "^4.1.0",
+    "husky": "^8.0.1",
+    "lint-staged": "^13.0.3",
+    "prettier": "^2.7.1",
+    "prettier-plugin-organize-imports": "^3.0.0",
+    "prettier-plugin-packagejson": "^2.2.18",
+    "sass": "^1.80.0",
+    "stylelint": "^14.9.1"
+  },
+  "peerDependencies": {
+    "@dnd-kit/core": ">=6.1.0",
+    "@dnd-kit/modifiers": ">=7.0.0",
+    "@dnd-kit/sortable": ">=8.0.0",
+    "@dnd-kit/utilities": ">=3.2.2",
+    "@tanstack/react-query": ">=5.59.15",
+    "@tensorflow-models/pose-detection": ">=2.1.3",
+    "@tensorflow/tfjs": ">=4.22.0",
+    "@vladmandic/face-api": ">=1.7.14",
+    "@xyflow/react": ">=12.3.3",
+    "antd": ">=5.21.4",
+    "axios": ">=1.7.7",
+    "dayjs": ">=1.11.13",
+    "lodash": ">=4.17.21",
+    "react": ">=18.0.0",
+    "react-dom": ">=18.0.0",
+    "yootd-webrtc-sdk": ">=1.0.1"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "authors": []
+}