zy-react-library 1.1.40 → 1.1.42

package/components/FormBuilder/FormBuilder.d.ts

@@ -1,4 +1,4 @@
-import type { FormProps } from "antd/es/form";
+import type { FormInstance, FormProps } from "antd/es/form";
 import type { Gutter } from "antd/es/grid/row";
 import type { FC, ReactNode } from "react";
 import type { FormOption, FormValues } from "./FormItemsRenderer";
@@ -6,7 +6,7 @@ import type { FormOption, FormValues } from "./FormItemsRenderer";
 /**
  * FormBuilder 组件属性
  */
-export interface FormBuilderProps extends FormProps {
+export interface FormBuilderProps extends Omit<FormProps, "form"> {
   /** 表单初始值 */
   values?: FormValues;
   /** 表单配置项数组 */
@@ -33,6 +33,8 @@ export interface FormBuilderProps extends FormProps {
   extraActionButtons?: ReactNode;
   /** 是否处于加载状态，默认 false */
   loading?: boolean;
+  /** 表单实例（通过 Form.useForm() 创建） */
+  form: FormInstance;
 }
 
 /**

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

@@ -1 +1 @@
-import{request as e}from"@cqsjjb/jjb-common-lib/http.js";import{useState as t,useEffect as r}from"react";import a from"../../Basic/index.js";import{jsx as n}from"react/jsx-runtime";const o=new Map;function i(i){const{params:s={},placeholder:m="人员",isNeedCorpInfoId:d=!1,isNeedDepartmentId:c=!0,isNeedPostId:p=!1,extraParams:f={noMain:"",eqEmploymentFlag:1},...l}=i,[u,I]=t([]);return r(()=>{(async()=>{const t=JSON.stringify({params:s,extraParams:f});if(o.has(t))return void I(o.get(t));if(I([]),d&&!s.corpinfoId)return;if(c&&!s.departmentId)return;if(p&&!s.postId)return;if(!d&&!c&&!p)return void console.error("【PersonnelSelect】 请至少传入一个参数");const{data:r}=await e("/basicInfo/user/listAll","get",{...s,...f,time:(new Date).getTime()});o.set(t,r),I(r)})()},[JSON.stringify(s),d,c,p,JSON.stringify(f)]),n(a,{data:u,placeholder:m,...l})}i.displayName="PersonnelSelect";export{i as default};
+import{request as e}from"@cqsjjb/jjb-common-lib/http.js";import{useState as t,useEffect as r}from"react";import a from"../../Basic/index.js";import{jsx as n}from"react/jsx-runtime";const o=new Map;function i(i){const{params:s={},placeholder:m="人员",isNeedCorpInfoId:d=!1,isNeedDepartmentId:c=!0,isNeedPostId:p=!1,extraParams:f={},...l}=i,u={noMain:"",eqEmploymentFlag:1},[I,g]=t([]);return r(()=>{(async()=>{const t={...u,...f},r=JSON.stringify({params:s,extraParams:t});if(o.has(r))return void g(o.get(r));if(g([]),d&&!s.corpinfoId)return;if(c&&!s.departmentId)return;if(p&&!s.postId)return;if(!d&&!c&&!p)return void console.error("【PersonnelSelect】 请至少传入一个参数");const{data:a}=await e("/basicInfo/user/listAll","get",{...s,...t,time:(new Date).getTime()});o.set(r,a),g(a)})()},[JSON.stringify(s),d,c,p,JSON.stringify(f)]),n(a,{data:I,placeholder:m,...l})}i.displayName="PersonnelSelect";export{i as default};

package/enum/uploadFile/gwj/index.d.ts

@@ -91,6 +91,8 @@ export declare const UPLOAD_FILE_TYPE_ENUM: {
   162: 162; // photos_safety_production_management_personnel - 安全生产管理人员证件照片
   163: 163; // education_and_training_application - 教培申请承诺书
   164: 164; // cover_of_education_and_training_courses - 课程封面
+  165: 165; // online_learning_sign_signature - 在线学习签到签字
+  166: 166; // online_learning_exam_signature - 在线学习考试签字
   302: 302; // fire_safety_inspection_passed_images - 消防点检检查合格
 };
 
@@ -187,5 +189,7 @@ export declare const UPLOAD_FILE_PATH_ENUM: {
   162: "photos_safety_production_management_personnel";
   163: "education_and_training_application";
   164: "cover_of_education_and_training_courses";
+  165: "online_learning_sign_signature";
+  166: "online_learning_exam_signature";
   302: "fire_safety_inspection_passed_images";
 };

package/enum/uploadFile/gwj/index.js

@@ -1 +1 @@
-const e={10:10,11:11,12:12,13:13,14:14,15:15,16:16,19:19,601:601,602:602,603:603,604:604,605:605,3:3,4:4,5:5,6:6,7:7,8:8,9:9,17:17,18:18,20:20,21:21,22:22,23:23,50:50,101:101,102:102,105:105,106:106,107:107,108:108,109:109,110:110,111:111,112:112,113:113,114:114,115:115,116:116,117:117,118:118,119:119,120:120,121:121,122:122,123:123,124:124,125:125,126:126,127:127,128:128,129:129,130:130,131:131,132:132,133:133,134:134,135:135,136:136,137:137,138:138,139:139,140:140,141:141,142:142,143:143,144:144,146:146,145:145,147:147,148:148,149:149,150:150,151:151,152:152,153:153,154:154,155:155,156:156,157:157,158:158,159:159,160:160,161:161,162:162,163:163,164:164,302:302},_={10:"labor_contract_image",11:"commercial_insurance_image",12:"certificate_information",13:"user_avatar",14:"id_card_photo",15:"social_security_card_photo",16:"work_related_injury_insurance_certificate",19:"three_level_safety_education_training",601:"gate_access_vehicle_license_photo",602:"gate_access_vehicle_photo",603:"gate_access_vehicle_attachment",604:"emission_standard_certificate",605:"motor_vehicle_registration_certificate_green_book",3:"hidden_danger_photo",4:"hidden_danger_rectification_photo",5:"hidden_danger_verification_photo",6:"certificate_photo",7:"confined_space_plan",8:"hidden_danger_rectification_plan",9:"confined_space_confirmation_signature",17:"special_equipment_inspection_photo",18:"personnel_certificate",20:"major_hazard_source_alarm_before_handling_photo",21:"major_hazard_source_alarm_after_handling_photo",22:"smart_access_control_external_vehicle_driver_license_photo",23:"smart_access_control_external_vehicle_registration_photo",50:"safety_and_environmental_inspection_final_acceptance_image",101:"hidden_danger_extension_temporary_measures_attachment",102:"hidden_danger_video",105:"blind_plate_position_map",106:"temporary_disposal_information",107:"rectification_suggestions_and_plan",108:"major_hidden_danger_investigation_report",109:"major_hidden_danger_safety_committee_or_party_committee_resolution_record",110:"significant_hidden_danger_rectification_temporary_disposal_measures",111:"significant_hidden_danger_rectification_hidden_danger_rectification_process_record",112:"supplement_major_hidden_danger_information",113:"safety_committee_office_meeting_record",114:"alarm_photo",115:"fire_equipment_type_qualification_photo",116:"hot_work_personnel_photo",117:"safety_pledge_signature",118:"hot_work_unit_responsible_person_confirmation_signature",119:"on_site_jurisdiction_unit_responsible_person_signature",120:"hot_work_permit_issuing_unit_signature",121:"hot_work_permit_signature",122:"pre_hot_work_jurisdiction_unit_confirmation_signature",123:"on_site_responsible_person_confirmation_signature",124:"post_hot_work_site_jurisdiction_unit_confirmation",125:"delayed_fire_monitoring_pictures",126:"safety_and_environmental_inspection_initiation_signature",127:"inspector_confirmation_signature",128:"inspected_person_confirmation_signature",129:"safety_and_environmental_inspection_appeal_signature",130:"hk_safety_committee_office_director_safety_director_issuance",131:"hot_work_contracting_unit_signature",132:"safety_director_approval",133:"branch_safety_director_approval",134:"project_authority_review_signature",135:"branch_manager_approval_signature",136:"accident_incident",137:"accident_incident",138:"hidden_disposal_plan",139:"safety_environmental_inspection_inspection_signature",140:"safety_environmental_inspection_inspection_situation",141:"safety_environmental_inspection_inspector_signature",142:"safety_environmental_inspection_inspected_signature",143:"safety_environmental_inspection_inspected_file",144:"safety_environmental_inspection_defense_signature",145:"qualified_list_inspection",146:"safety_environmental_inspection_acceptance",147:"hidden_qualified_listInspection_signature",148:"special_qualification",149:"safety_qualification",150:"promise_bookmark_photo",151:"project_related_materials",152:"legal_and_regulatory_database",153:"regulations_resource_library",154:"responsibility_based_resource_library",155:"institutional_resource_library",156:"security_management_agreement",157:"supervision_personnel_vehicle",158:"supervision_personnel_vehicle_license",159:"special_operation_personnel_photo",160:"special_equipment_operator_photo",161:"main_responsible_person_photo",162:"photos_safety_production_management_personnel",163:"education_and_training_application",164:"cover_of_education_and_training_courses",302:"fire_safety_inspection_passed_images"};export{_ as UPLOAD_FILE_PATH_ENUM,e as UPLOAD_FILE_TYPE_ENUM};
+const e={10:10,11:11,12:12,13:13,14:14,15:15,16:16,19:19,601:601,602:602,603:603,604:604,605:605,3:3,4:4,5:5,6:6,7:7,8:8,9:9,17:17,18:18,20:20,21:21,22:22,23:23,50:50,101:101,102:102,105:105,106:106,107:107,108:108,109:109,110:110,111:111,112:112,113:113,114:114,115:115,116:116,117:117,118:118,119:119,120:120,121:121,122:122,123:123,124:124,125:125,126:126,127:127,128:128,129:129,130:130,131:131,132:132,133:133,134:134,135:135,136:136,137:137,138:138,139:139,140:140,141:141,142:142,143:143,144:144,146:146,145:145,147:147,148:148,149:149,150:150,151:151,152:152,153:153,154:154,155:155,156:156,157:157,158:158,159:159,160:160,161:161,162:162,163:163,164:164,165:165,166:166,302:302},_={10:"labor_contract_image",11:"commercial_insurance_image",12:"certificate_information",13:"user_avatar",14:"id_card_photo",15:"social_security_card_photo",16:"work_related_injury_insurance_certificate",19:"three_level_safety_education_training",601:"gate_access_vehicle_license_photo",602:"gate_access_vehicle_photo",603:"gate_access_vehicle_attachment",604:"emission_standard_certificate",605:"motor_vehicle_registration_certificate_green_book",3:"hidden_danger_photo",4:"hidden_danger_rectification_photo",5:"hidden_danger_verification_photo",6:"certificate_photo",7:"confined_space_plan",8:"hidden_danger_rectification_plan",9:"confined_space_confirmation_signature",17:"special_equipment_inspection_photo",18:"personnel_certificate",20:"major_hazard_source_alarm_before_handling_photo",21:"major_hazard_source_alarm_after_handling_photo",22:"smart_access_control_external_vehicle_driver_license_photo",23:"smart_access_control_external_vehicle_registration_photo",50:"safety_and_environmental_inspection_final_acceptance_image",101:"hidden_danger_extension_temporary_measures_attachment",102:"hidden_danger_video",105:"blind_plate_position_map",106:"temporary_disposal_information",107:"rectification_suggestions_and_plan",108:"major_hidden_danger_investigation_report",109:"major_hidden_danger_safety_committee_or_party_committee_resolution_record",110:"significant_hidden_danger_rectification_temporary_disposal_measures",111:"significant_hidden_danger_rectification_hidden_danger_rectification_process_record",112:"supplement_major_hidden_danger_information",113:"safety_committee_office_meeting_record",114:"alarm_photo",115:"fire_equipment_type_qualification_photo",116:"hot_work_personnel_photo",117:"safety_pledge_signature",118:"hot_work_unit_responsible_person_confirmation_signature",119:"on_site_jurisdiction_unit_responsible_person_signature",120:"hot_work_permit_issuing_unit_signature",121:"hot_work_permit_signature",122:"pre_hot_work_jurisdiction_unit_confirmation_signature",123:"on_site_responsible_person_confirmation_signature",124:"post_hot_work_site_jurisdiction_unit_confirmation",125:"delayed_fire_monitoring_pictures",126:"safety_and_environmental_inspection_initiation_signature",127:"inspector_confirmation_signature",128:"inspected_person_confirmation_signature",129:"safety_and_environmental_inspection_appeal_signature",130:"hk_safety_committee_office_director_safety_director_issuance",131:"hot_work_contracting_unit_signature",132:"safety_director_approval",133:"branch_safety_director_approval",134:"project_authority_review_signature",135:"branch_manager_approval_signature",136:"accident_incident",137:"accident_incident",138:"hidden_disposal_plan",139:"safety_environmental_inspection_inspection_signature",140:"safety_environmental_inspection_inspection_situation",141:"safety_environmental_inspection_inspector_signature",142:"safety_environmental_inspection_inspected_signature",143:"safety_environmental_inspection_inspected_file",144:"safety_environmental_inspection_defense_signature",145:"qualified_list_inspection",146:"safety_environmental_inspection_acceptance",147:"hidden_qualified_listInspection_signature",148:"special_qualification",149:"safety_qualification",150:"promise_bookmark_photo",151:"project_related_materials",152:"legal_and_regulatory_database",153:"regulations_resource_library",154:"responsibility_based_resource_library",155:"institutional_resource_library",156:"security_management_agreement",157:"supervision_personnel_vehicle",158:"supervision_personnel_vehicle_license",159:"special_operation_personnel_photo",160:"special_equipment_operator_photo",161:"main_responsible_person_photo",162:"photos_safety_production_management_personnel",163:"education_and_training_application",164:"cover_of_education_and_training_courses",165:"online_learning_sign_signature",166:"online_learning_exam_signature",302:"fire_safety_inspection_passed_images"};export{_ as UPLOAD_FILE_PATH_ENUM,e as UPLOAD_FILE_TYPE_ENUM};

package/hooks/useGetFile/index.js

@@ -1 +1 @@
-import{request as e}from"@cqsjjb/jjb-common-lib/http.js";import{useState as o}from"react";import{UPLOAD_FILE_TYPE_ENUM as r}from"../../enum/uploadFile/gwj/index.js";import{addingPrefixToFile as i}from"../../utils/index.js";function n(n="object"){const[t,l]=o(!1);let s=0;const a=o=>{if(o)return s++,s>0&&l(!0),new Promise((n,t)=>{const{eqType:a,eqForeignKey:c,single:p=!0,foreignKey:f,dataSource:g}=o;if(!a)return void console.error("【getFile】 缺少 options.eqType 参数");if(!Object.values(r).includes(a))return void console.error(`【getFile】 传入的 eqType 不在 UPLOAD_FILE_TYPE_ENUM 中，当前传入的 eqType 是 ${a}`);if(p){if(null==c||""===c)return void console.error("【getFile】 缺少 options.eqForeignKey 参数")}else{if(null==f||""===f)return void console.error("【getFile】 缺少 options.foreignKey 参数");if(null==g||""===g)return void console.error("【getFile】 缺少 options.dataSource 参数");if(0===g.length)return void n(g)}const u=p?{eqType:a,eqForeignKey:c}:{eqType:a,inForeignKey:g.map(e=>e[f]).join(",")};e("/basicInfo/imgFiles/listAll","get",u).then(e=>{if(p)n(i(e.data).map(e=>({...e,type:void 0})));else{const o=new Map;e.data.forEach(e=>{o.has(e.foreignKey)||o.set(e.foreignKey,[]),o.get(e.foreignKey).push({...e,type:void 0})});const r=g.map(e=>{const r=e[f],n=o.has(r)?i(o.get(r)):[];return{...e,files:n}});n(r)}}).catch(e=>{t(e)}).finally(()=>{s--,s<=0&&l(!1)})});console.error("【getFile】 缺少 options 参数")};return"array"===n?[t,a]:{loading:t,getFile:a}}export{n as default};
+import{request as e}from"@cqsjjb/jjb-common-lib/http.js";import{useState as o}from"react";import{UPLOAD_FILE_TYPE_ENUM as r}from"../../enum/uploadFile/gwj/index.js";import{addingPrefixToFile as i}from"../../utils/index.js";function n(n="object"){const[t,l]=o(!1);let s=0;const a=o=>{if(o)return s++,s>0&&l(!0),new Promise((n,t)=>{const{eqType:a,eqForeignKey:c,single:p=!0,foreignKey:f,dataSource:g}=o;if(!a)return void console.error("【getFile】 缺少 options.eqType 参数");if(!Object.values(r).includes(a))return void console.error(`【getFile】 传入的 eqType 不在 UPLOAD_FILE_TYPE_ENUM 中，当前传入的 eqType 是 ${a}`);if(p){if(null==c||""===c)return void console.error("【getFile】 缺少 options.eqForeignKey 参数")}else{if(null==f||""===f)return void console.error("【getFile】 缺少 options.foreignKey 参数");if(null==g||""===g)return void console.error("【getFile】 缺少 options.dataSource 参数");if(0===g.length)return l(!1),void n(g)}const u=p?{eqType:a,eqForeignKey:c}:{eqType:a,inForeignKey:g.map(e=>e[f]).join(",")};e("/basicInfo/imgFiles/listAll","get",u).then(e=>{if(p)n(i(e.data).map(e=>({...e,type:void 0})));else{const o=new Map;e.data.forEach(e=>{o.has(e.foreignKey)||o.set(e.foreignKey,[]),o.get(e.foreignKey).push({...e,type:void 0})});const r=g.map(e=>{const r=e[f],n=o.has(r)?i(o.get(r)):[];return{...e,files:n}});n(r)}}).catch(e=>{t(e)}).finally(()=>{s--,s<=0&&l(!1)})});console.error("【getFile】 缺少 options 参数")};return"array"===n?[t,a]:{loading:t,getFile:a}}export{n as default};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zy-react-library",
   "private": false,
-  "version": "1.1.40",
+  "version": "1.1.42",
   "type": "module",
   "description": "",
   "author": "LiuJiaNan",
@@ -30,7 +30,7 @@
   },
   "dependencies": {
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@ant-design/icons": "^6.1.0",
+    "@ant-design/icons": "^5.6.1",
     "@ant-design/pro-components": "^2.8.10",
     "@cqsjjb/jjb-common-lib": "latest",
     "@wangeditor/editor": "^5.1.23",