zy-react-library 1.0.105 → 1.0.107

package/components/Select/Personnel/Gwj/index.js

@@ -1,45 +1,45 @@
-import { request } from "@cqsjjb/jjb-common-lib/http";
-import { useEffect, useState } from "react";
-import BasicSelect from "../../Basic";
-
-/**
- * 人员下拉组件（港务局版本）
- */
-function PersonnelSelect(props) {
-  const {
-    params = {},
-    placeholder = "人员",
-    isNeedCorpInfoId = false,
-    isNeedDepartmentId = true,
-    isNeedPostId = false,
-    ...restProps
-  } = props;
-
-  const [data, setData] = useState([]);
-
-  const getData = async () => {
-    setData([]);
-    // 根据参数决定是否发送请求
-    if (isNeedCorpInfoId && !params.corpinfoId)
-      return;
-    if (isNeedDepartmentId && !params.departmentId)
-      return;
-    if (isNeedPostId && !params.postId)
-      return;
-
-    const { data } = await request("/basic-info/user/listAll", "get", params);
-    setData(data);
-  };
-
-  useEffect(() => {
-    getData();
-  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedDepartmentId, isNeedPostId]);
-
-  return (
-    <BasicSelect data={data} placeholder={placeholder} {...restProps} />
-  );
-}
-
-PersonnelSelect.displayName = "PersonnelSelect";
-
-export default PersonnelSelect;
+import { request } from "@cqsjjb/jjb-common-lib/http";
+import { useEffect, useState } from "react";
+import BasicSelect from "../../Basic";
+
+/**
+ * 人员下拉组件（港务局版本）
+ */
+function PersonnelSelect(props) {
+  const {
+    params = {},
+    placeholder = "人员",
+    isNeedCorpInfoId = false,
+    isNeedDepartmentId = true,
+    isNeedPostId = false,
+    ...restProps
+  } = props;
+
+  const [data, setData] = useState([]);
+
+  const getData = async () => {
+    setData([]);
+    // 根据参数决定是否发送请求
+    if (isNeedCorpInfoId && !params.corpinfoId)
+      return;
+    if (isNeedDepartmentId && !params.departmentId)
+      return;
+    if (isNeedPostId && !params.postId)
+      return;
+
+    const { data } = await request("/basic-info/user/listAll", "get", params);
+    setData(data);
+  };
+
+  useEffect(() => {
+    getData();
+  }, [JSON.stringify(params), isNeedCorpInfoId, isNeedDepartmentId, isNeedPostId]);
+
+  return (
+    <BasicSelect data={data} placeholder={placeholder} {...restProps} />
+  );
+}
+
+PersonnelSelect.displayName = "PersonnelSelect";
+
+export default PersonnelSelect;

package/enum/hidden/gwj/index.js

@@ -2,7 +2,6 @@
 export const HIDDEN_SOURCE_ENUM = [
   { bianma: "1", name: "隐患快报" },
   { bianma: "2", name: "清单排查" },
-  { bianma: "3", name: "清单排查" },
   { bianma: "4", name: "安全环保检查(监管端)" },
   { bianma: "5", name: "安全环保检查(企业端)" },
   { bianma: "6", name: "消防检查" },
@@ -20,6 +19,7 @@ export const HIDDEN_STATE_ENUM = [
   { bianma: "400", name: "归档" },
   { bianma: "99", name: "用户暂存" },
   { bianma: "98", name: "安全环保检查/清单排查暂存" },
+  { bianma: "102", name: "安全环保检查，隐患带指派" },
   { bianma: "97", name: "已过期" },
   { bianma: "101", name: "忽略隐患" },
 ];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.0.105",
+  "version": "1.0.107",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",

package/utils/index.js

@@ -64,9 +64,10 @@ export function image2Base642(file) {
 /**
  base64转File对象
  */
-export function base642File(base64, filename = "file") {
+export function base642File(base64, filename = 'file') {
   const arr = base64.split(",");
   const mime = arr[0].match(/:(.*?);/)[1];
+  const ext = mime.split('/')[1];
   const bstr = atob(arr[1]);
   let n = bstr.length;
   const u8arr = new Uint8Array(n);
@@ -75,7 +76,7 @@ export function base642File(base64, filename = "file") {
     u8arr[n] = bstr.charCodeAt(n);
   }
 
-  return new File([u8arr], filename, { type: mime });
+  return new File([u8arr], `${filename}.${ext}`, { type: mime });
 }
 
 /**