将开源版本的修改打补丁应用到商业版

src/components/Form/src/componentMap.ts

@@ -75,11 +75,13 @@ import JRangeNumber from './jeecg/components/JRangeNumber.vue';
 import LinkTableForQuery from '/@/components/jeecg/super/desform/LinkTableForQuery.vue';
 import CascaderPcaForQuery from '/@/components/jeecg/super/desform/CascaderPcaForQuery.vue';
 import UserSelect from './jeecg/components/userSelect/index.vue';
-import JRangeDate from './jeecg/components/JRangeDate.vue'
-import JRangeTime from './jeecg/components/JRangeTime.vue'
-import JInputSelect from './jeecg/components/JInputSelect.vue'
+import JRangeDate from './jeecg/components/JRangeDate.vue';
+import JRangeTime from './jeecg/components/JRangeTime.vue';
+import JInputSelect from './jeecg/components/JInputSelect.vue';
 import RoleSelectInput from './jeecg/components/roleSelect/RoleSelectInput.vue';
 import {DatePickerInFilter, CascaderPcaInFilter} from "@/components/InFilter";
+import SzSelectUser from '@/components/semri/userComponent/SzUserSelect.vue';
+import SzSelectUserByDept from '@/components/semri/userComponent/SzSelectUserByDept.vue';
 
 const componentMap = new Map<ComponentType, Component>();
 
@@ -178,8 +180,8 @@ componentMap.set('RangeDate', JRangeDate);
 componentMap.set('RangeTime', JRangeTime);
 componentMap.set('RoleSelect', RoleSelectInput);
 componentMap.set('JInputSelect', JInputSelect);
-
-
+componentMap.set('SzSelectUser', SzSelectUser);
+componentMap.set('SzSelectUserByDept',SzSelectUserByDept)
 
 export function add(compName: ComponentType, component: Component) {
   componentMap.set(compName, component);

src/components/Form/src/jeecg/components/JSelectUser.vue

@@ -50,10 +50,10 @@
       },
       //update-begin---author:wangshuai ---date:20230703  for：【QQYUN-5685】5、离职人员可以选自己------------
       //排除用户id的集合
-      excludeUserIdList:{
+      excludeUserIdList: {
         type: Array,
         default: () => [],
-      }
+      },
       //update-end---author:wangshuai ---date:20230703  for：【QQYUN-5685】5、离职人员可以选自己------------
     },
     emits: ['options-change', 'change', 'update:value'],
@@ -110,15 +110,19 @@
 
       //update-begin---author:wangshuai ---date:20230703  for：【QQYUN-5685】5、离职人员可以选自己------------
       const excludeUserIdList = ref<any>([]);
-      
+
       /**
        * 需要监听一下excludeUserIdList，否则modal获取不到
-       */ 
-      watch(()=>props.excludeUserIdList,(data)=>{
-        excludeUserIdList.value = data;
-      },{ immediate: true })
+       */
+      watch(
+        () => props.excludeUserIdList,
+        (data) => {
+          excludeUserIdList.value = data;
+        },
+        { immediate: true }
+      );
       //update-end---author:wangshuai ---date:20230703  for：【QQYUN-5685】5、离职人员可以选自己------------
-      
+
       /**
        * 打卡弹出框
        */
@@ -169,7 +173,7 @@
         send(tempSave);
       };
       const send = (values) => {
-        let result = typeof props.value == "string" ? values.join(',') : values;
+        let result = typeof props.value == 'string' ? values.join(',') : values;
         emit('update:value', result);
         emit('change', result);
       };

src/components/Form/src/jeecg/components/modal/UserSelectModal.vue

@@ -163,6 +163,11 @@
             field: 'realname',
             component: 'JInput',
           },
+          {
+            label: '密级',
+            field: 'userSecurityLevel',
+            component: 'JInput',
+          },
         ],
       };
       //定义表格列

src/components/Form/src/types/index.ts

@@ -158,5 +158,7 @@ export type ComponentType =
   | 'RangeTime'
   | 'JRangeNumber'
   | 'JLinkTableCard'
-  | 'JInputSelect';
+  | 'JInputSelect'
+  | 'SzSelectUser'
+  | 'SzSelectUserByDept';