af-mobile-client-vue3 1.3.42 → 1.3.43

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.3.42",
+  "version": "1.3.43",
   "packageManager": "pnpm@10.13.1",
   "description": "Vue + Vite component lib",
   "engines": {

package/src/api/user/index.ts

@@ -1,40 +1,40 @@
-import { loginApi } from '@af-mobile-client-vue3/services/api/Login'
-
-import { get, post } from '@af-mobile-client-vue3/services/restTools'
-import { http } from '@af-mobile-client-vue3/utils/http'
-
-export interface BasicResponseModel<T = any> {
-  code: number
-  msg: string
-  data: T
-}
-
-export function login(data: any) {
-  return post(
-    loginApi.Login,
-    data,
-  )
-}
-
-export function OALogin(data: any) {
-  return get(`/af-system/user/${data.username}/${data.password}/智慧OA`)
-}
-
-/**
- * @description: 获取用户信息
- */
-export function getUserInfo() {
-  return get(
-    '/getUserInfo',
-  )
-}
-
-/**
- * @description: 用户登出
- */
-export function doLogout() {
-  return http.request({
-    url: loginApi.Logout,
-    method: 'DELETE',
-  })
-}
+import { loginApi } from '@af-mobile-client-vue3/services/api/Login'
+
+import { get, post } from '@af-mobile-client-vue3/services/restTools'
+import { http } from '@af-mobile-client-vue3/utils/http'
+
+export interface BasicResponseModel<T = any> {
+  code: number
+  msg: string
+  data: T
+}
+
+export function login(data: any) {
+  return post(
+    loginApi.Login,
+    data,
+  )
+}
+
+export function OALogin(data: any) {
+  return get(`/af-system/user/${data.username}/${data.password}/智慧OA`)
+}
+
+/**
+ * @description: 获取用户信息
+ */
+export function getUserInfo() {
+  return get(
+    '/getUserInfo',
+  )
+}
+
+/**
+ * @description: 用户登出
+ */
+export function doLogout() {
+  return http.request({
+    url: loginApi.Logout,
+    method: 'DELETE',
+  })
+}

package/src/components/data/XForm/index.vue

@@ -39,6 +39,7 @@ interface GroupFormItems {
   tableName?: string
   paramLogicName?: string
   isGroupForm?: boolean
+  isKeyHandle?: boolean
 }
 
 interface InitParams {
@@ -85,6 +86,7 @@ const loaded = ref(false)
 const form = ref({})
 const rules = reactive({})
 const myGetDataParams = ref({})
+const isKeyHandle = ref(false)
 
 // 配置相关状态
 const formConfig = ref<GroupFormItems | null>(null)
@@ -92,7 +94,7 @@ const formGroupName = ref<string>('default')
 const myServiceName = ref('')
 const tableName = ref('')
 
-// 计算属性
+// 计算属性（获取全部表单项信息）
 const realJsonData = computed(() => {
   const sourceFormItems = formConfig.value?.formJson
   if (!sourceFormItems)
@@ -103,6 +105,13 @@ const realJsonData = computed(() => {
   })
 })
 
+// 过滤出用于新增/修改/只读场景的表单项
+const addOrEditJsonData = computed(() => {
+  return realJsonData.value.filter((item) => {
+    return item.addOrEdit === 'all' || item.addOrEdit === 'add' || item.addOrEdit === 'edit' || item.addOrEdit === 'readonly'
+  })
+})
+
 // 过滤出用于静默新增场景的表单项
 const silenceAddJsonData = computed(() => {
   return realJsonData.value.filter((item) => {
@@ -208,6 +217,7 @@ async function initWithGroupFormItems() {
 function setupFormConfig(config: GroupFormItems) {
   loadParamLogicNameData(config.paramLogicName)
   formConfig.value = config
+  isKeyHandle.value = config.isKeyHandle
   myServiceName.value = props.serviceName || undefined
   formGroupName.value = config.groupName || 'default'
   form.value = props.formData || {}
@@ -388,9 +398,10 @@ function getRealKey(key: string, mustHandleKey = false) {
 async function asyncSubmit() {
   return new Promise((resolve, reject) => {
     validate().then(async () => {
-      const cleanedForm = prepareForm()
-      await appendSilenceAddFields(cleanedForm)
-      const realForm = handleFormKeys(cleanedForm)
+      let realForm = prepareForm()
+      await appendSilenceAddFields(realForm)
+      if (isKeyHandle.value)
+        realForm = handleFormKeys(realForm)
       resolve({
         realForm,
         mode: props.mode,
@@ -545,11 +556,11 @@ function getFormData() {
 async function onSubmit() {
   await validate()
   // 清理表单数据
-  const cleanedForm = prepareForm()
+  let realForm = prepareForm()
+  await appendSilenceAddFields(realForm)
   if (!props.configName && props.groupFormItems) {
     // 只有单表才可以成功，多表关联或者自定义sql不行
-    await appendSilenceAddFields(cleanedForm)
-    const realForm = handleFormKeys(cleanedForm)
+    realForm = handleFormKeys(realForm)
 
     try {
       addOrModifyEntity(realForm, tableName.value, props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME).then(() => {
@@ -566,8 +577,10 @@ async function onSubmit() {
     }
   }
   else {
+    if (isKeyHandle.value)
+      realForm = handleFormKeys(realForm)
     // 使用清理后的数据
-    emits('onSubmit', cleanedForm)
+    emits('onSubmit', realForm)
   }
 }
 async function validate() {
@@ -586,7 +599,7 @@ defineExpose({ init, form, formGroupName, validate, asyncSubmit, setForm, getFor
     <div class="form-fields-scrollable">
       <VanCellGroup :title="groupTitle">
         <XFormItem
-          v-for="(item, index) in realJsonData"
+          v-for="(item, index) in addOrEditJsonData"
           :key="index"
           v-model="form[item.model]"
           :mode="props.mode"

package/src/router/routes.ts

@@ -155,7 +155,7 @@ const routes: Array<RouteRecordRaw> = [
         component: XFormAppraiseView,
       },
       {
-        path: '/Component/XFormView/:id/:openid',
+        path: '/Component/XFormView',
         name: 'XFormView',
         component: XFormView,
       },

package/src/services/api/Login.ts

@@ -1,6 +1,6 @@
-const loginApi = {
-  Login: '/af-auth/login',
-  Logout: '/af-auth/logout',
-}
-
-export { loginApi }
+const loginApi = {
+  Login: '/af-auth/login',
+  Logout: '/af-auth/logout',
+}
+
+export { loginApi }

package/src/stores/modules/user.ts

@@ -251,7 +251,7 @@ export const useUserStore = defineStore('app-user', () => {
     }
   }
   const loginExternalMini = async (data: any) => {
-    try {
+    try {
       // 设置Token
       setToken(data.access_token)
 

package/src/styles/login.less

@@ -1,109 +1,109 @@
-html:not(.dark) {
-  .form {
-    .form_field {
-      :deep(.van-field__label) {
-        color: rgb(88, 88, 88);
-      }
-      :deep(.van-field__body) {
-        background: rgb(251, 251, 251);
-        box-shadow: inset 0 0 1px 0 rgba(0, 0, 0, 0.1);
-        color: rgb(71, 71, 71);
-      }
-      :deep(.van-cell) {
-        background: #ffffff;
-      }
-    }
-    .extra_setting {
-      .extra_setting_for_remember_password {
-        color: rgb(88, 88, 88);
-      }
-    }
-  }
-}
-.form {
-  width: 100%;
-  padding: 0 40px;
-  .form_field {
-    padding-right: 0;
-    padding-left: 0;
-    :deep(.van-field__label) {
-      opacity: 0.7;
-      font-size: 16px;
-      font-weight: 400;
-      line-height: 23px;
-      text-transform: uppercase;
-      text-indent: 10px;
-    }
-    :deep(.van-field__body) {
-      height: 40px;
-      border-radius: 5px;
-      font-size: 16px;
-      font-weight: 400;
-      padding: 8px 10px;
-      opacity: 0.6;
-    }
-  }
-  .extra_setting {
-    font-size: 12px;
-    font-weight: 400;
-    line-height: 12px;
-    .extra_setting_for_remember_password {
-      opacity: 0.7;
-      span {
-        position: relative;
-        bottom: 3px;
-        left: 5px;
-      }
-    }
-    .extra_setting_for_reset_password {
-      position: relative;
-      top: 2px;
-      opacity: 0.7;
-      color: rgb(56, 149, 250);
-    }
-  }
-  .btn {
-    height: 50px;
-    :deep(.van-button__text) {
-      color: rgb(255, 255, 255);
-      font-size: 16px;
-      font-weight: 700;
-      line-height: 23px;
-    }
-  }
-  .login_btn {
-    background: rgb(56, 149, 250);
-    margin-top: 104px;
-  }
-  .reset_btn {
-    margin: 24px 0;
-  }
-  .back_btn {
-    :deep(.van-button__text) {
-      color: rgb(56, 149, 250);
-    }
-  }
-  :deep(.van-cell:after) {
-    border-bottom: none;
-  }
-}
-.login_form {
-  margin-top: 65px;
-}
-.forget_password_form {
-  margin-top: 15px;
-}
-/* 使图标垂直居中 */
-.wechat-login-btn .van-icon {
-  vertical-align: middle;
-}
-/* 悬停效果 */
-.wechat-login-btn:hover {
-  background-color: #06ad56 !important;
-  border-color: #06ad56 !important;
-}
-/* 点击效果 */
-.wechat-login-btn:active {
-  background-color: #05994c !important;
-  border-color: #05994c !important;
-}
+html:not(.dark) {
+  .form {
+    .form_field {
+      :deep(.van-field__label) {
+        color: rgb(88, 88, 88);
+      }
+      :deep(.van-field__body) {
+        background: rgb(251, 251, 251);
+        box-shadow: inset 0 0 1px 0 rgba(0, 0, 0, 0.1);
+        color: rgb(71, 71, 71);
+      }
+      :deep(.van-cell) {
+        background: #ffffff;
+      }
+    }
+    .extra_setting {
+      .extra_setting_for_remember_password {
+        color: rgb(88, 88, 88);
+      }
+    }
+  }
+}
+.form {
+  width: 100%;
+  padding: 0 40px;
+  .form_field {
+    padding-right: 0;
+    padding-left: 0;
+    :deep(.van-field__label) {
+      opacity: 0.7;
+      font-size: 16px;
+      font-weight: 400;
+      line-height: 23px;
+      text-transform: uppercase;
+      text-indent: 10px;
+    }
+    :deep(.van-field__body) {
+      height: 40px;
+      border-radius: 5px;
+      font-size: 16px;
+      font-weight: 400;
+      padding: 8px 10px;
+      opacity: 0.6;
+    }
+  }
+  .extra_setting {
+    font-size: 12px;
+    font-weight: 400;
+    line-height: 12px;
+    .extra_setting_for_remember_password {
+      opacity: 0.7;
+      span {
+        position: relative;
+        bottom: 3px;
+        left: 5px;
+      }
+    }
+    .extra_setting_for_reset_password {
+      position: relative;
+      top: 2px;
+      opacity: 0.7;
+      color: rgb(56, 149, 250);
+    }
+  }
+  .btn {
+    height: 50px;
+    :deep(.van-button__text) {
+      color: rgb(255, 255, 255);
+      font-size: 16px;
+      font-weight: 700;
+      line-height: 23px;
+    }
+  }
+  .login_btn {
+    background: rgb(56, 149, 250);
+    margin-top: 104px;
+  }
+  .reset_btn {
+    margin: 24px 0;
+  }
+  .back_btn {
+    :deep(.van-button__text) {
+      color: rgb(56, 149, 250);
+    }
+  }
+  :deep(.van-cell:after) {
+    border-bottom: none;
+  }
+}
+.login_form {
+  margin-top: 65px;
+}
+.forget_password_form {
+  margin-top: 15px;
+}
+/* 使图标垂直居中 */
+.wechat-login-btn .van-icon {
+  vertical-align: middle;
+}
+/* 悬停效果 */
+.wechat-login-btn:hover {
+  background-color: #06ad56 !important;
+  border-color: #06ad56 !important;
+}
+/* 点击效果 */
+.wechat-login-btn:active {
+  background-color: #05994c !important;
+  border-color: #05994c !important;
+}

package/src/utils/environment.ts

@@ -29,17 +29,17 @@ function getPlatformFromClient(): string {
 
 function inferPlatformFromUserAgent(userAgent: string): string {
   const ua = (userAgent || '').toLowerCase()
-  if (ua.includes('windows'))
+  if (ua.includes('windows'))
     return 'windows'
-  if (ua.includes('mac os x') || ua.includes('macintosh') || ua.includes('mac os'))
+  if (ua.includes('mac os x') || ua.includes('macintosh') || ua.includes('mac os'))
     return 'macos'
-  if (ua.includes('android'))
+  if (ua.includes('android'))
     return 'android'
-  if (ua.includes('iphone') || ua.includes('ipad') || ua.includes('ipod') || ua.includes('ios'))
+  if (ua.includes('iphone') || ua.includes('ipad') || ua.includes('ipod') || ua.includes('ios'))
     return 'ios'
-  if (ua.includes('cros'))
+  if (ua.includes('cros'))
     return 'chrome os'
-  if (ua.includes('linux'))
+  if (ua.includes('linux'))
     return 'linux'
   return 'unknown'
 }
@@ -89,13 +89,13 @@ export function detectEnvironment(): EnvironmentInfo {
 export function getCurrentScene(): 'wechat' | 'browser' | 'miniprogram' | 'app' | 'unknown' {
   const env = detectEnvironment()
 
-  if (env.isMiniprogram)
+  if (env.isMiniprogram)
     return 'miniprogram'
-  if (env.isWechat)
+  if (env.isWechat)
     return 'wechat'
-  if (env.isApp)
+  if (env.isApp)
     return 'app'
-  if (env.isBrowser)
+  if (env.isBrowser)
     return 'browser'
 
   return 'unknown'

package/src/utils/platform-auth.ts

@@ -120,7 +120,7 @@ export function isExternalUser(to: RouteLocationNormalized): ExternalUserResult
       isExternal: true,
       authParams: {
         platformType: PlatformType.DINGTALK,
-      },
+      },
     }
   }
 

package/src/utils/queryFormDefaultRangePicker.ts

@@ -1,57 +1,57 @@
-/**
- * 根据类型获取日期区间字符串
- * @param type '当年' | 'curMonth' | '当日'
- * @param show 区分实际值还是显示值, true为实际值, false为显示值
- * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
- */
-export function getRangeByType(type: string, show: boolean): [string, string] {
-  const now = new Date()
-  const year = now.getFullYear()
-  const month = (now.getMonth() + 1).toString().padStart(2, '0')
-  const day = now.getDate().toString().padStart(2, '0')
-
-  if (!show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01 00:00:00`,
-        `${year}-12-31 23:59:59`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01 00:00:00`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day} 00:00:00`,
-        `${year}-${month}-${day} 23:59:59`,
-      ]
-    }
-  }
-  if (show) {
-    if (type === 'curYear') {
-      return [
-        `${year}-01-01`,
-        `${year}-12-31`,
-      ]
-    }
-    if (type === 'curMonth') {
-      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
-      return [
-        `${year}-${month}-01`,
-        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
-      ]
-    }
-    if (type === 'curDay') {
-      return [
-        `${year}-${month}-${day}`,
-        `${year}-${month}-${day}`,
-      ]
-    }
-  }
-  // 兜底返回空字符串数组
-  return ['', '']
-}
+/**
+ * 根据类型获取日期区间字符串
+ * @param type '当年' | 'curMonth' | '当日'
+ * @param show 区分实际值还是显示值, true为实际值, false为显示值
+ * @returns [start, end] 例：['2024-01-01 00:00:00', '2024-12-31 23:59:59']
+ */
+export function getRangeByType(type: string, show: boolean): [string, string] {
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = (now.getMonth() + 1).toString().padStart(2, '0')
+  const day = now.getDate().toString().padStart(2, '0')
+
+  if (!show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01 00:00:00`,
+        `${year}-12-31 23:59:59`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01 00:00:00`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')} 23:59:59`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day} 00:00:00`,
+        `${year}-${month}-${day} 23:59:59`,
+      ]
+    }
+  }
+  if (show) {
+    if (type === 'curYear') {
+      return [
+        `${year}-01-01`,
+        `${year}-12-31`,
+      ]
+    }
+    if (type === 'curMonth') {
+      const lastDay = new Date(year, now.getMonth() + 1, 0).getDate()
+      return [
+        `${year}-${month}-01`,
+        `${year}-${month}-${lastDay.toString().padStart(2, '0')}`,
+      ]
+    }
+    if (type === 'curDay') {
+      return [
+        `${year}-${month}-${day}`,
+        `${year}-${month}-${day}`,
+      ]
+    }
+  }
+  // 兜底返回空字符串数组
+  return ['', '']
+}