adtec-core-package 1.3.2 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "adtec-core-package",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "private": false,
   "type": "module",
   "scripts": {

package/src/components/business/comp.userForm.vue

@@ -17,12 +17,13 @@
         labelPosition="top"
         size="default"
       >
-        <el-form-item :style="{ width: '200px' }" label="所属部门" prop="deptIds">
+        <el-form-item :style="{ width: '220px' }" label="所属部门" prop="deptIds">
           <el-tree-select
             ref="ref_tree"
-            v-model="queryParam.deptIds"
-            :collapse-tags="true"
+            check-strictly
+            v-model="queryParam.deptId"
             :data="orgDeptTree"
+            filterable
             :default-expand-all="true"
             :props="{
               label: 'name',
@@ -30,17 +31,13 @@
               disabled: (data: IOrgDeptInfo) => data.isValid !== '1' || queryParam.disabled,
             }"
             :render-after-expand="false"
-            :renderContent="renderTreeNode"
-            check-strictly
             clearable
             collapse-tags-tooltip
-            multiple
             node-key="id"
             placeholder="请选择所属部门"
-            show-checkbox
           />
         </el-form-item>
-        <el-form-item :style="{ width: '200px' }" label="人员编码或名称" prop="codeorname">
+        <el-form-item :style="{ width: '220px' }" label="人员编码或名称" prop="codeorname">
           <el-input
             v-model="queryParam.codeorname"
             clearable
@@ -93,7 +90,7 @@
             style="display: flex; justify-content: center; align-items: center; padding-left: 8px"
           >
             <el-radio v-model="checkId" :label="scope.row.id" @change="handleRadioChange(scope.row)"
-              ><span></span
+            ><span></span
             ></el-radio>
           </div>
         </template>
@@ -101,8 +98,8 @@
       <el-table-column :show-overflow-tooltip="true" label="用户姓名" prop="name" width="120" />
       <el-table-column label="用户编码" prop="code" width="120" />
       <el-table-column :show-overflow-tooltip="true" label="岗位名称" prop="postName" width="120" />
-      <el-table-column :show-overflow-tooltip="true" label="所属部门" prop="deptName" width="120" />
-      <el-table-column :show-overflow-tooltip="true" label="所属组织" prop="orgName" />
+      <el-table-column :show-overflow-tooltip="true" label="所属部门" prop="deptName"  />
+      <el-table-column :show-overflow-tooltip="true" label="所属组织" prop="orgName" v-if="props.showOrgInfo" width="220"/>
     </el-table>
     <el-pagination
       v-model:current-page="queryParam.current"
@@ -131,21 +128,23 @@ import frameworkUtils from '../../utils/FrameworkUtils'
 interface Props<T extends IpageDataQuery, E extends IMdmEmployee> {
   fetchData?: (data: T) => Promise<PageData<E>>
   defalutQueryParam?: any
-  multiple?: boolean
+  multiple?: boolean,
+  showOrgInfo?: boolean
 }
 
 const props = withDefaults(defineProps<Props<IMdmEmployeeQuery, IMdmEmployee>>(), {
   fetchData: EmployeeInfoApi.getMdmEmployeeListByIds,
   defalutQueryParam: {
     disabled: false,
-    deptIds: [],
+    deptId: undefined
   },
   multiple: true,
+  showOrgInfo:true
 })
 const [queryParam, resetQueryParam] = useResetRefHooks<IMdmEmployeeQuery>({
   current: 1,
   size: frameworkUtils.getPageSize(),
-  disabled: false,
+  disabled: props.defalutQueryParam.disabled
 })
 const emit = defineEmits(['success'])
 const orgDeptTree = ref<IOrgDeptInfo[]>([])
@@ -165,10 +164,6 @@ const [userList, resetUserList] = useResetRefHooks<PageData<IMdmEmployee>>({
 const getTreeData = async () => {
   try {
     orgDeptTree.value = await deptInfoApi.getMdmOrgDeptTree({})
-    nextTick(() => {
-      queryParam.value = {...queryParam.value, ...props.defalutQueryParam,  }
-      ref_tree.value?.setCheckedKeys(props.defalutQueryParam.deptIds)
-    })
   } catch (error: any) {
     frameworkUtils.messageError(error)
   }
@@ -223,35 +218,38 @@ const selectRows = (selects: IMdmEmployee[], row?: IMdmEmployee) => {
 const judgeIsSel = (selects: IMdmEmployee[], row: IMdmEmployee) => {
   return selects.some((item) => item.code === row.code)
 }
-const resetQuery = () => {
+const resetQuery = async () => {
+  loading.value = true
   resetSelectUserList()
   resetUserList()
   queryRef.value?.resetFields()
-  ref_tree.value?.setCheckedKeys([])
+  ref_tree.value?.setCurrentKey(null)
   resetQueryParam()
+  if (!(orgDeptTree.value && orgDeptTree.value.length)) {
+    await getTreeData()
+  }
   nextTick(() => {
+    queryParam.value = {...queryParam.value, ...props.defalutQueryParam,  }
+    ref_tree.value?.setCurrentKey(props.defalutQueryParam.deptId)
     handleQuery()
   })
 }
 const handleQuery = async () => {
   try {
     loading.value = true
-    const deptIds = [] as string[]
-    const orgIds = [] as string[]
-    const select: IOrgDeptInfo[] = ref_tree.value?.getCheckedNodes()
-    if (select && select.length) {
-      select.forEach((item: IOrgDeptInfo) => {
-        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-        !item.mdmOrgId && orgIds.push(item.id!)
-      })
-      select.forEach((item: IOrgDeptInfo) => {
-        // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-        item.mdmOrgId && !orgIds.includes(item.mdmOrgId) && deptIds.push(item.id!)
-      })
+    let deptId = undefined
+    let orgId = undefined
+    const select: IOrgDeptInfo[] = ref_tree.value?.getCurrentNode()
+    if (select && select.id) {
+      if (select.mdmOrgId) {
+        deptId = select.id
+      } else {
+        orgId = select.id
+      }
     }
     let params = JSON.parse(JSON.stringify(queryParam.value))
-    params.deptIds = deptIds
-    params.orgIds = orgIds
+    params.deptId = deptId
+    params.orgId = orgId
     //需要合并默认参数
     userList.value = await props.fetchData(params)
     //设置选中
@@ -281,9 +279,6 @@ const confirm = async () => {
     emit('success', props.multiple ? selectUserList.value : selectRow.value)
   }
 }
-onMounted(() => {
-  getTreeData()
-})
 defineExpose({
   confirm,
   resetQuery,

package/src/css/vxeTableUI/components/table.scss

@@ -909,7 +909,7 @@
       background-color: var(--vxe-ui-table-row-radio-checked-background-color);
     }
     &.row--checked {
-      background-color: var(--vxe-ui-table-row-checkbox-checked-background-color);
+      background-color: var(--vxe-ui-table-row-current-background-color);
     }
     &.row--current {
       background-color: var(--vxe-ui-table-row-current-background-color);
@@ -923,10 +923,10 @@
         background-color: var(--vxe-ui-table-row-hover-radio-checked-background-color);
       }
       &.row--checked {
-        //background-color: var(--vxe-ui-table-row-hover-checkbox-checked-background-color);
+        background-color: var(--vxe-ui-table-row-current-background-color);
       }
       &.row--current {
-        background-color: var(--vxe-ui-table-row-hover-current-background-color);
+        background-color: var(--vxe-ui-table-row-current-background-color);
       }
     }
   }

package/src/css/vxeTableUI/theme/base.scss

@@ -19,7 +19,7 @@
   --vxe-ui-input-height-mini: 28px;
 
   /*table*/
-  --vxe-ui-table-header-font-color: var(--vxe-ui-font-color);
+  --vxe-ui-table-header-font-color: #1F2633;
   --vxe-ui-table-footer-font-color: var(--vxe-ui-font-color);
   --vxe-ui-table-border-radius: var(--vxe-ui-border-radius);
   --vxe-ui-table-border-width: 1.05px;

package/src/utils/commonRules.ts

@@ -0,0 +1,57 @@
+export default {
+  /**
+   * 校验身份证号码
+   * @param rule
+   * @param value
+   * @param callback
+   */
+  validateIDCard: (rule: any, value: any, callback: any) => {
+    if (!value) {
+      callback()
+    } else if (value.length !== 18) {
+      callback(new Error('身份证号码必须是18位'))
+    } else {
+      const weight = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]
+      const checkCode = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2']
+      let sum = 0
+      for (let i = 0; i < 17; i++) {
+        sum += parseInt(value[i]) * weight[i]
+      }
+      const mod = sum % 11
+      if (checkCode[mod] === value[17]) {
+        callback()
+      } else {
+        callback(new Error('身份证号码校验错误'))
+      }
+    }
+  },
+  /**
+   * 校验手机号码
+   * @param rule
+   * @param value
+   * @param callback
+   */
+   validatePhone : (rule: any, value: any, callback: any) => {
+    const phoneReg = /^1[3-9]\d{9}$/
+    if (!value || value === '') {
+      callback()
+    } else if (!phoneReg.test(value)) {
+      callback(new Error('请输入正确的手机号码'))
+    } else {
+      callback()
+    }
+  },
+  /**
+   * 校验邮箱
+   */
+  validateEmail: (rule: any, value: any, callback: any) => {
+    const emailReg = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/
+    if (!value || value === '') {
+      callback()
+    } else if (!emailReg.test(value)) {
+      callback(new Error('请输入正确的邮箱'))
+    } else {
+      callback()
+    }
+  }
+}