af-mobile-client-vue3 1.3.42 → 1.3.44

package/package.json

@@ -1,115 +1,115 @@
-{
-  "name": "af-mobile-client-vue3",
-  "type": "module",
-  "version": "1.3.42",
-  "packageManager": "pnpm@10.13.1",
-  "description": "Vue + Vite component lib",
-  "engines": {
-    "node": ">=20.19.0"
-  },
-  "scripts": {
-    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
-    "compress": "node ./compress.js",
-    "build:dev": "vue-tsc --noEmit && vite build --mode development && pnpm run compress",
-    "build:pro": "vue-tsc --noEmit && vite build --mode production && pnpm run compress",
-    "preview": "vite preview",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "release": "bumpp --commit --push --tag",
-    "typecheck": "vue-tsc --noEmit",
-    "commitlint": "commitlint --edit",
-    "prepare": "simple-git-hooks"
-  },
-  "dependencies": {
-    "@iconify/vue": "4.3.0",
-    "@micro-zoe/micro-app": "1.0.0-rc.26",
-    "@unhead/vue": "2.0.12",
-    "@vant/area-data": "^2.0.0",
-    "@vant/touch-emulator": "^1.4.0",
-    "@vant/use": "^1.6.0",
-    "@vueuse/core": "^13.5.0",
-    "axios": "^1.10.0",
-    "crypto-js": "^4.2.0",
-    "dayjs": "^1.11.13",
-    "echarts": "^5.6.0",
-    "lodash-es": "^4.17.21",
-    "nprogress": "^0.2.0",
-    "ol": "^10.5.0",
-    "pinia": "^3.0.3",
-    "pinia-plugin-persistedstate": "^4.4.1",
-    "resize-detector": "^0.3.0",
-    "vant": "^4.9.21",
-    "vconsole": "^3.15.1",
-    "vue": "^3.5.17",
-    "vue-i18n": "^11.1.10",
-    "vue-router": "^4.5.1",
-    "vue3-hash-calendar": "^1.1.3",
-    "weixin-js-sdk": "^1.6.5"
-  },
-  "devDependencies": {
-    "@antfu/eslint-config": "4.17.0",
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
-    "@commitlint/types": "^19.8.1",
-    "@iconify/json": "2.2.318",
-    "@iconify/utils": "^2.3.0",
-    "@intlify/unplugin-vue-i18n": "^6.0.8",
-    "@types/crypto-js": "^4.2.2",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^24.0.14",
-    "@types/nprogress": "^0.2.3",
-    "@unocss/eslint-config": "66.3.3",
-    "@vitejs/plugin-legacy": "^7.0.1",
-    "@vitejs/plugin-vue": "^6.0.0",
-    "autoprefixer": "^10.4.21",
-    "bumpp": "^10.2.0",
-    "consola": "^3.4.2",
-    "cross-env": "^7.0.3",
-    "eslint": "^9.31.0",
-    "eslint-plugin-format": "^1.0.1",
-    "less": "^4.4.0",
-    "lint-staged": "^16.1.2",
-    "mockjs": "^1.1.0",
-    "postcss-mobile-forever": "^5.0.0",
-    "rollup": "^4.45.1",
-    "simple-git-hooks": "^2.13.0",
-    "tar": "^7.4.3",
-    "terser": "^5.43.1",
-    "typescript": "^5.8.3",
-    "unocss": "66.3.3",
-    "vite": "^7.0.5",
-    "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-mock-dev-server": "^1.9.1",
-    "vite-plugin-pwa": "^1.0.1",
-    "vite-plugin-sitemap": "^0.8.2",
-    "vite-plugin-vconsole": "^2.1.1",
-    "vite-plugin-vue-devtools": "^7.7.7",
-    "vue-tsc": "^3.0.2"
-  },
-  "pnpm": {
-    "allowedDeprecatedVersions": {
-      "glob": "7.2.3",
-      "inflight": "1.0.6",
-      "sourcemap-codec": "1.4.8"
-    },
-    "peerDependencyRules": {
-      "allowedVersions": {}
-    },
-    "onlyBuiltDependencies": [
-      "core-js",
-      "esbuild",
-      "simple-git-hooks",
-      "unrs-resolver"
-    ]
-  },
-  "resolutions": {
-    "vite": "^7.0.5"
-  },
-  "simple-git-hooks": {
-    "pre-commit": "pnpm lint-staged",
-    "commit-msg": "pnpm commitlint $1"
-  },
-  "lint-staged": {
-    "*": "eslint --fix"
-  }
-}
+{
+  "name": "af-mobile-client-vue3",
+  "type": "module",
+  "version": "1.3.44",
+  "packageManager": "pnpm@10.13.1",
+  "description": "Vue + Vite component lib",
+  "engines": {
+    "node": ">=20.19.0"
+  },
+  "scripts": {
+    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
+    "compress": "node ./compress.js",
+    "build:dev": "vue-tsc --noEmit && vite build --mode development && pnpm run compress",
+    "build:pro": "vue-tsc --noEmit && vite build --mode production && pnpm run compress",
+    "preview": "vite preview",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "release": "bumpp --commit --push --tag",
+    "typecheck": "vue-tsc --noEmit",
+    "commitlint": "commitlint --edit",
+    "prepare": "simple-git-hooks"
+  },
+  "dependencies": {
+    "@iconify/vue": "4.3.0",
+    "@micro-zoe/micro-app": "1.0.0-rc.26",
+    "@unhead/vue": "2.0.12",
+    "@vant/area-data": "^2.0.0",
+    "@vant/touch-emulator": "^1.4.0",
+    "@vant/use": "^1.6.0",
+    "@vueuse/core": "^13.5.0",
+    "axios": "^1.10.0",
+    "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.13",
+    "echarts": "^5.6.0",
+    "lodash-es": "^4.17.21",
+    "nprogress": "^0.2.0",
+    "ol": "^10.5.0",
+    "pinia": "^3.0.3",
+    "pinia-plugin-persistedstate": "^4.4.1",
+    "resize-detector": "^0.3.0",
+    "vant": "^4.9.21",
+    "vconsole": "^3.15.1",
+    "vue": "^3.5.17",
+    "vue-i18n": "^11.1.10",
+    "vue-router": "^4.5.1",
+    "vue3-hash-calendar": "^1.1.3",
+    "weixin-js-sdk": "^1.6.5"
+  },
+  "devDependencies": {
+    "@antfu/eslint-config": "4.17.0",
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@commitlint/types": "^19.8.1",
+    "@iconify/json": "2.2.318",
+    "@iconify/utils": "^2.3.0",
+    "@intlify/unplugin-vue-i18n": "^6.0.8",
+    "@types/crypto-js": "^4.2.2",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^24.0.14",
+    "@types/nprogress": "^0.2.3",
+    "@unocss/eslint-config": "66.3.3",
+    "@vitejs/plugin-legacy": "^7.0.1",
+    "@vitejs/plugin-vue": "^6.0.0",
+    "autoprefixer": "^10.4.21",
+    "bumpp": "^10.2.0",
+    "consola": "^3.4.2",
+    "cross-env": "^7.0.3",
+    "eslint": "^9.31.0",
+    "eslint-plugin-format": "^1.0.1",
+    "less": "^4.4.0",
+    "lint-staged": "^16.1.2",
+    "mockjs": "^1.1.0",
+    "postcss-mobile-forever": "^5.0.0",
+    "rollup": "^4.45.1",
+    "simple-git-hooks": "^2.13.0",
+    "tar": "^7.4.3",
+    "terser": "^5.43.1",
+    "typescript": "^5.8.3",
+    "unocss": "66.3.3",
+    "vite": "^7.0.5",
+    "vite-plugin-compression": "^0.5.1",
+    "vite-plugin-mock-dev-server": "^1.9.1",
+    "vite-plugin-pwa": "^1.0.1",
+    "vite-plugin-sitemap": "^0.8.2",
+    "vite-plugin-vconsole": "^2.1.1",
+    "vite-plugin-vue-devtools": "^7.7.7",
+    "vue-tsc": "^3.0.2"
+  },
+  "pnpm": {
+    "allowedDeprecatedVersions": {
+      "glob": "7.2.3",
+      "inflight": "1.0.6",
+      "sourcemap-codec": "1.4.8"
+    },
+    "peerDependencyRules": {
+      "allowedVersions": {}
+    },
+    "onlyBuiltDependencies": [
+      "core-js",
+      "esbuild",
+      "simple-git-hooks",
+      "unrs-resolver"
+    ]
+  },
+  "resolutions": {
+    "vite": "^7.0.5"
+  },
+  "simple-git-hooks": {
+    "pre-commit": "pnpm lint-staged",
+    "commit-msg": "pnpm commitlint $1"
+  },
+  "lint-staged": {
+    "*": "eslint --fix"
+  }
+}

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/external-routes.ts

@@ -1,60 +1,60 @@
-/**
- * 外部用户路由配置（简化版示例）
- * 为外部用户提供基本的示例页面
- */
-
-import type { RouteRecordRaw } from 'vue-router'
-
-// 导入外部用户专用组件
-import ExternalHome from '@af-mobile-client-vue3/views/external/index.vue'
-import my from '@af-mobile-client-vue3/views/user/my/index.vue'
-
-/**
- * 外部用户路由元信息的默认配置
- */
-const externalUserMeta = {
-  requiresAuth: true,
-  allowExternalUser: true,
-}
-
-/**
- * 外部用户专用路由（简化版示例）
- */
-const externalUserRoutes: Array<RouteRecordRaw> = [
-  // 外部用户首页
-  {
-    path: '/wechat',
-    name: 'ExternalHome',
-    component: ExternalHome,
-    meta: {
-      ...externalUserMeta,
-      title: '外部用户首页',
-    },
-  },
-  // 用户个人中心
-  {
-    path: '/wechat/my',
-    name: 'ExternalUserProfile',
-    component: my,
-    meta: {
-      ...externalUserMeta,
-      title: '个人中心',
-    },
-  },
-]
-
-/**
- * 获取外部用户可访问的路由列表
- */
-export function getExternalUserRoutes(): RouteRecordRaw[] {
-  return externalUserRoutes
-}
-
-/**
- * 检查路由是否为外部用户路由
- */
-export function isExternalUserRoute(path: string): boolean {
-  return path.startsWith('/ex')
-}
-
-export default externalUserRoutes
+/**
+ * 外部用户路由配置（简化版示例）
+ * 为外部用户提供基本的示例页面
+ */
+
+import type { RouteRecordRaw } from 'vue-router'
+
+// 导入外部用户专用组件
+import ExternalHome from '@af-mobile-client-vue3/views/external/index.vue'
+import my from '@af-mobile-client-vue3/views/user/my/index.vue'
+
+/**
+ * 外部用户路由元信息的默认配置
+ */
+const externalUserMeta = {
+  requiresAuth: true,
+  allowExternalUser: true,
+}
+
+/**
+ * 外部用户专用路由（简化版示例）
+ */
+const externalUserRoutes: Array<RouteRecordRaw> = [
+  // 外部用户首页
+  {
+    path: '/wechat',
+    name: 'ExternalHome',
+    component: ExternalHome,
+    meta: {
+      ...externalUserMeta,
+      title: '外部用户首页',
+    },
+  },
+  // 用户个人中心
+  {
+    path: '/wechat/my',
+    name: 'ExternalUserProfile',
+    component: my,
+    meta: {
+      ...externalUserMeta,
+      title: '个人中心',
+    },
+  },
+]
+
+/**
+ * 获取外部用户可访问的路由列表
+ */
+export function getExternalUserRoutes(): RouteRecordRaw[] {
+  return externalUserRoutes
+}
+
+/**
+ * 检查路由是否为外部用户路由
+ */
+export function isExternalUserRoute(path: string): boolean {
+  return path.startsWith('/ex/')
+}
+
+export default externalUserRoutes