af-mobile-client-vue3 1.2.15 → 1.2.17

package/package.json

@@ -1,113 +1,113 @@
-{
-  "name": "af-mobile-client-vue3",
-  "type": "module",
-  "version": "1.2.15",
-  "packageManager": "pnpm@10.12.3",
-  "description": "Vue + Vite component lib",
-  "engines": {
-    "node": ">=20.19.0"
-  },
-  "scripts": {
-    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
-    "build": "vue-tsc --noEmit && vite build",
-    "build:dev": "vue-tsc --noEmit && vite build --mode=development",
-    "preview": "vite preview",
-    "lint": "eslint . && vue-tsc --noEmit",
-    "lint:fix": "eslint . --fix",
-    "release": "bumpp --commit --push --tag",
-    "typecheck": "vue-tsc --noEmit",
-    "commitlint": "commitlint --edit",
-    "prepare": "simple-git-hooks"
-  },
-  "dependencies": {
-    "@vant/area-data": "^2.0.0",
-    "crypto-js": "^4.2.0",
-    "dayjs": "^1.11.13",
-    "ol": "^10.5.0",
-    "vue3-hash-calendar": "^1.1.3",
-    "@iconify/vue": "4.3.0",
-    "@micro-zoe/micro-app": "1.0.0-rc.24",
-    "@unhead/vue": "2.0.11",
-    "@vant/touch-emulator": "^1.4.0",
-    "@vant/use": "^1.6.0",
-    "@vueuse/core": "^13.4.0",
-    "axios": "^1.10.0",
-    "echarts": "^5.6.0",
-    "lodash-es": "^4.17.21",
-    "nprogress": "^0.2.0",
-    "pinia": "^3.0.3",
-    "pinia-plugin-persistedstate": "^4.3.0",
-    "resize-detector": "^0.3.0",
-    "vant": "^4.9.20",
-    "vconsole": "^3.15.1",
-    "vue": "^3.5.17",
-    "vue-i18n": "^11.1.7",
-    "vue-router": "^4.5.1"
-  },
-  "devDependencies": {
-    "vite-plugin-compression": "^0.5.1",
-    "@iconify/json": "2.2.318",
-    "@types/crypto-js": "^4.2.2",
-    "@antfu/eslint-config": "4.16.1",
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
-    "@commitlint/types": "^19.8.1",
-    "@intlify/unplugin-vue-i18n": "^6.0.8",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^24.0.4",
-    "@types/nprogress": "^0.2.3",
-    "@unocss/eslint-config": "66.2.3",
-    "@vitejs/plugin-legacy": "^7.0.0",
-    "@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.29.0",
-    "eslint-plugin-format": "^1.0.1",
-    "less": "^4.3.0",
-    "lint-staged": "^16.1.2",
-    "mockjs": "^1.1.0",
-    "postcss-mobile-forever": "^5.0.0",
-    "rollup": "^4.44.0",
-    "simple-git-hooks": "^2.13.0",
-    "terser": "^5.43.1",
-    "typescript": "^5.8.3",
-    "unocss": "66.2.3",
-    "vite": "^7.0.0",
-    "vite-plugin-mock-dev-server": "^1.9.1",
-    "vite-plugin-pwa": "^1.0.0",
-    "vite-plugin-sitemap": "^0.8.2",
-    "vite-plugin-vconsole": "^2.1.1",
-    "vite-plugin-vue-devtools": "^7.7.7",
-    "vue-tsc": "^2.2.10"
-  },
-  "pnpm": {
-    "allowedDeprecatedVersions": {
-      "glob": "7.2.3",
-      "inflight": "1.0.6",
-      "sourcemap-codec": "1.4.8"
-    },
-    "peerDependencyRules": {
-      "allowedVersions": {
-        "typescript": "5.8.3"
-      }
-    },
-    "onlyBuiltDependencies": [
-      "core-js",
-      "esbuild",
-      "simple-git-hooks",
-      "unrs-resolver"
-    ]
-  },
-  "resolutions": {
-    "vite": "^7.0.0"
-  },
-  "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.2.17",
+  "packageManager": "pnpm@10.12.3",
+  "description": "Vue + Vite component lib",
+  "engines": {
+    "node": ">=20.19.0"
+  },
+  "scripts": {
+    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
+    "build": "vue-tsc --noEmit && vite build",
+    "build:dev": "vue-tsc --noEmit && vite build --mode=development",
+    "preview": "vite preview",
+    "lint": "eslint . && vue-tsc --noEmit",
+    "lint:fix": "eslint . --fix",
+    "release": "bumpp --commit --push --tag",
+    "typecheck": "vue-tsc --noEmit",
+    "commitlint": "commitlint --edit",
+    "prepare": "simple-git-hooks"
+  },
+  "dependencies": {
+    "@vant/area-data": "^2.0.0",
+    "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.13",
+    "ol": "^10.5.0",
+    "vue3-hash-calendar": "^1.1.3",
+    "@iconify/vue": "4.3.0",
+    "@micro-zoe/micro-app": "1.0.0-rc.24",
+    "@unhead/vue": "2.0.11",
+    "@vant/touch-emulator": "^1.4.0",
+    "@vant/use": "^1.6.0",
+    "@vueuse/core": "^13.4.0",
+    "axios": "^1.10.0",
+    "echarts": "^5.6.0",
+    "lodash-es": "^4.17.21",
+    "nprogress": "^0.2.0",
+    "pinia": "^3.0.3",
+    "pinia-plugin-persistedstate": "^4.3.0",
+    "resize-detector": "^0.3.0",
+    "vant": "^4.9.20",
+    "vconsole": "^3.15.1",
+    "vue": "^3.5.17",
+    "vue-i18n": "^11.1.7",
+    "vue-router": "^4.5.1"
+  },
+  "devDependencies": {
+    "vite-plugin-compression": "^0.5.1",
+    "@iconify/json": "2.2.318",
+    "@types/crypto-js": "^4.2.2",
+    "@antfu/eslint-config": "4.16.1",
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@commitlint/types": "^19.8.1",
+    "@intlify/unplugin-vue-i18n": "^6.0.8",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^24.0.4",
+    "@types/nprogress": "^0.2.3",
+    "@unocss/eslint-config": "66.2.3",
+    "@vitejs/plugin-legacy": "^7.0.0",
+    "@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.29.0",
+    "eslint-plugin-format": "^1.0.1",
+    "less": "^4.3.0",
+    "lint-staged": "^16.1.2",
+    "mockjs": "^1.1.0",
+    "postcss-mobile-forever": "^5.0.0",
+    "rollup": "^4.44.0",
+    "simple-git-hooks": "^2.13.0",
+    "terser": "^5.43.1",
+    "typescript": "^5.8.3",
+    "unocss": "66.2.3",
+    "vite": "^7.0.0",
+    "vite-plugin-mock-dev-server": "^1.9.1",
+    "vite-plugin-pwa": "^1.0.0",
+    "vite-plugin-sitemap": "^0.8.2",
+    "vite-plugin-vconsole": "^2.1.1",
+    "vite-plugin-vue-devtools": "^7.7.7",
+    "vue-tsc": "^2.2.10"
+  },
+  "pnpm": {
+    "allowedDeprecatedVersions": {
+      "glob": "7.2.3",
+      "inflight": "1.0.6",
+      "sourcemap-codec": "1.4.8"
+    },
+    "peerDependencyRules": {
+      "allowedVersions": {
+        "typescript": "5.8.3"
+      }
+    },
+    "onlyBuiltDependencies": [
+      "core-js",
+      "esbuild",
+      "simple-git-hooks",
+      "unrs-resolver"
+    ]
+  },
+  "resolutions": {
+    "vite": "^7.0.0"
+  },
+  "simple-git-hooks": {
+    "pre-commit": "pnpm lint-staged",
+    "commit-msg": "pnpm commitlint $1"
+  },
+  "lint-staged": {
+    "*": "eslint --fix"
+  }
+}

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/XCellList/index.vue

@@ -141,6 +141,9 @@ const buttonState = ref(undefined)
 const groupFormItems = ref({})
 const title = ref('')
 
+// 按钮权限
+const buttonPermissions = ref([])
+
 const slots = useSlots()
 
 // 当前组件实例（不推荐使用，可能会在后续的版本更迭中调整，暂时用来绑定函数的上下文）
@@ -202,9 +205,10 @@ function initComponent() {
 
     if (result.buttonState) {
       buttonState.value = result.buttonState
-      if (buttonState.value.edit && buttonState.value.edit === true)
+      buttonPermissions.value = result.buttonPermissions
+      if (buttonState.value.edit && buttonState.value.edit === true && (filterButtonPermissions('edit').state === false || ((filterButtonPermissions('edit').state === true && userState.f.resources.f_role_name.includes((filterButtonPermissions('edit').roleStr))))))
         allActions.value.push({ text: '修改', func: 'updateRow' })
-      if (buttonState.value.delete && buttonState.value.delete === true)
+      if (buttonState.value.delete && buttonState.value.delete === true && (filterButtonPermissions('delete').state === false || ((filterButtonPermissions('delete').state === true && userState.f.resources.f_role_name.includes((filterButtonPermissions('delete').roleStr))))))
         allActions.value.push({ text: '删除', func: 'deleteRow' })
     }
     splitArrayAt(allActions.value, 3)
@@ -452,6 +456,11 @@ function addOption() {
   }
 }
 
+// 按钮权限信息筛选
+function filterButtonPermissions(btn) {
+  return buttonPermissions.value.find(item => item.btnName === btn)
+}
+
 // 处理按钮点击
 function handleButtonClick(btn, item) {
   emit(`${btn.btnIcon}`, item)
@@ -546,6 +555,7 @@ defineExpose({
           :order-list="orderList"
           :form-query="formQueryList"
           :button-state="buttonState"
+          :button-permissions="buttonPermissions"
           :scan-options="scanOptions"
           @on-refresh="onRefresh"
           @add-option="addOption"

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

@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import XGridDropOption from '@af-mobile-client-vue3/components/core/XGridDropOption/index.vue'
 import XFormItem from '@af-mobile-client-vue3/components/data/XFormItem/index.vue'
+import useUserStore from '@af-mobile-client-vue3/stores/modules/user'
 import { Icon } from '@iconify/vue'
 import {
   showFailToast,
@@ -23,6 +24,7 @@ const props = defineProps<{
   orderList?: any[]
   formQuery?: any[]
   buttonState?: any
+  buttonPermissions?: any[]
   scanOptions?: {
     show?: boolean // 是否显示扫码按钮
     type?: string | string[] // 显示类型：可以是单个类型，也可以是类型数组
@@ -41,6 +43,8 @@ const emit = defineEmits([
   'onNFC',
 ])
 
+const userState = useUserStore().getLogin()
+
 // 定义扫描模式枚举，便于扩展
 const SCAN_MODES = {
   SCAN: 'scan', // 扫码模式
@@ -276,6 +280,11 @@ function handleFilterMenuChange(value: boolean) {
 function handleCloseScanButton() {
   listFilterMenu.value.close(false)
 }
+
+// 按钮权限信息筛选
+function filterButtonPermissions(btn) {
+  return props.buttonPermissions.find(item => item.btnName === btn)
+}
 </script>
 
 <template>
@@ -385,7 +394,11 @@ function handleCloseScanButton() {
             <VanButton type="default" @click="resetOption">
               重置
             </VanButton>
-            <VanButton v-if="props.buttonState.add && props.buttonState.add === true" type="primary" @click="addOption">
+            <VanButton
+              v-if="props.buttonState.add && props.buttonState.add === true && (filterButtonPermissions('add').state === false || ((filterButtonPermissions('add').state === true && userState.f.resources.f_role_name.includes((filterButtonPermissions('add').roleStr)))))"
+              type="primary"
+              @click="addOption"
+            >
               新增
             </VanButton>
             <VanButton type="primary" @click="confirmOption">

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

@@ -42,6 +42,7 @@ const props = withDefaults(defineProps<{
   formName?: string
   mode?: string
   submitButton?: boolean
+  isHandleFormKey?: boolean
 }>(), {
   configName: undefined,
   groupFormItems: null,
@@ -50,6 +51,7 @@ const props = withDefaults(defineProps<{
   formName: 'default',
   mode: '查询',
   submitButton: true,
+  isHandleFormKey: true,
 })
 const emits = defineEmits(['onSubmit'])
 const userStore = useUserStore()
@@ -76,9 +78,6 @@ const realJsonData = computed(() => {
   })
 })
 
-// 是否处理表单Key值
-const isHandleFormKey = ref(true)
-
 // 过滤出用于静默新增场景的表单项
 const silenceAddJsonData = computed(() => {
   return myFormItems.value.filter((item) => {
@@ -263,7 +262,7 @@ function setForm(obj) {
 function getRealKey(key, mustHandleKey = false) {
   if (key === 'selected_id')
     return key
-  if (isHandleFormKey.value || mustHandleKey) {
+  if (props.isHandleFormKey || mustHandleKey) {
     return key.substring(key.indexOf('_') + 1)
   }
   else {
@@ -305,7 +304,7 @@ function handleFormKeys(form, mustHandleKey = false) {
       realForm[extraFormKey][realKey] = value
     }
     else {
-      const realKey = isHandleFormKey.value || mustHandleKey ? getRealKey(key, mustHandleKey) : key
+      const realKey = props.isHandleFormKey || mustHandleKey ? getRealKey(key, mustHandleKey) : key
       // 如果发生重名，不覆盖，把key的别名带上
       if (realForm[realKey]) {
         realForm[key] = value

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

@@ -7,7 +7,8 @@ import XGridDropOption from '@af-mobile-client-vue3/components/core/XGridDropOpt
 import XMultiSelect from '@af-mobile-client-vue3/components/core/XMultiSelect/index.vue'
 import XSelect from '@af-mobile-client-vue3/components/core/XSelect/index.vue'
 import XLocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
-import { runLogic } from '@af-mobile-client-vue3/services/api/common'
+import { getConfigByNameAsync, runLogic } from '@af-mobile-client-vue3/services/api/common'
+import { post } from '@af-mobile-client-vue3/services/restTools'
 import { searchToListOption, searchToOption } from '@af-mobile-client-vue3/services/v3Api'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { getDict } from '@af-mobile-client-vue3/utils/dictUtil'
@@ -94,6 +95,7 @@ const emits = defineEmits(['update:modelValue', 'set-form'])
 // 判断并初始化防抖函数
 let debouncedUserLinkFunc: (() => void) | null = null
 let debouncedDepLinkFunc: (() => void) | null = null
+let debouncedUpdateOptions: (() => void) | null = null
 
 const { attr, form, mode, serviceName, getDataParams, columnsField } = props
 const calendarShow = ref(false)
@@ -445,6 +447,10 @@ onBeforeMount(() => {
 
   if (attr?.keyName?.toString()?.startsWith('search@根据表单项[') && attr?.keyName?.toString().endsWith(']联动部门'))
     debouncedDepLinkFunc = debounce(() => updateResOptions('部门'), 200)
+
+  if (attr.keyName && (attr?.keyName?.toString().indexOf('async ') !== -1 || attr?.keyName?.toString()?.indexOf('function') !== -1)) {
+    debouncedUpdateOptions = debounce(updateOptions, 200)
+  }
 })
 // 是否展示表单左侧label文字
 const labelData = computed(() => {
@@ -474,6 +480,13 @@ function onCalendarConfirm(values) {
   calendarShow.value = false
 }
 
+// js 函数作为数据源
+async function updateOptions() {
+  if (attr.keyName && (attr.keyName.toString().includes('async ') || attr.keyName.toString().includes('function '))) {
+    option.value = await executeStrFunctionByContext(this, attr.keyName, [form, runLogic, mode, getConfigByNameAsync, post])
+  }
+}
+
 function init() {
   if (attr.keyName && typeof attr.keyName === 'string') {
     if (attr.keyName && attr.keyName.includes('logic@')) {
@@ -509,6 +522,9 @@ function init() {
       else
         searchToOption(searchData, res => getDataCallback(res))
     }
+    else if (attr.keyName.toString().includes('async ') || attr.keyName.toString().includes('function ')) {
+      updateOptions()
+    }
     else {
       initRadioValue()
     }

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/setting.ts

@@ -1,62 +1,58 @@
-import { getConfigByNameAsync } from '@af-mobile-client-vue3/services/api/common'
-import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
-import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
-import { defineStore } from 'pinia'
-import { ref } from 'vue'
-
-export interface WebConfig {
-  systemName: string
-  routerName: string
-  systemDesc: string
-  homePage: string
-  defaultAvatarUrl: string
-  wechatLogin: boolean
-  wxLoginAge: boolean
-  wxAutoLogin: string
-  tenantName: string
-}
-
-//  存放 webConfig 中的 setting 配置
-export const useSettingStore = defineStore('setting', () => {
-  const setting = ref<WebConfig>(undefined)
-  const isInitialized = ref(false)
-
-  const setSetting = (newSetting: WebConfig) => {
-    setting.value = newSetting
-  }
-
-  const getSetting = () => {
-    return setting.value
-  }
-
-  // 将 init 作为 store 的方法导出
-  const init = async () => {
-    if (isInitialized.value)
-      return
-
-    const useStore = createStorage()
-    const catchWebConfig = useStore.get(APP_WEB_CONFIG_KEY)
-    if (catchWebConfig?.setting) {
-      setSetting(catchWebConfig?.setting)
-    }
-    else {
-      const res = await getConfigByNameAsync('webMobileConfig')
-      if (res.setting) {
-        useStore.set(APP_WEB_CONFIG_KEY, res)
-        console.log('res.setting', res.setting)
-        setSetting(res.setting)
-      }
-    }
-
-    isInitialized.value = true
-  }
-
-  return {
-    setSetting,
-    getSetting,
-    init, // 导出 init 方法
-    isInitialized,
-  }
-})
-
-export default useSettingStore
+import { getConfigByNameAsync } from '@af-mobile-client-vue3/services/api/common'
+import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
+import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+
+export interface WebConfig {
+  systemName: string
+  routerName: string
+  systemDesc: string
+  homePage: string
+  defaultAvatarUrl: string
+  wechatLogin: boolean
+}
+
+//  存放 webConfig 中的 setting 配置
+export const useSettingStore = defineStore('setting', () => {
+  const setting = ref<WebConfig>(undefined)
+  const isInitialized = ref(false)
+
+  const setSetting = (newSetting: WebConfig) => {
+    setting.value = newSetting
+  }
+
+  const getSetting = () => {
+    return setting.value
+  }
+
+  // 将 init 作为 store 的方法导出
+  const init = async () => {
+    if (isInitialized.value)
+      return
+
+    const useStore = createStorage()
+    const catchWebConfig = useStore.get(APP_WEB_CONFIG_KEY)
+    if (catchWebConfig) {
+      setSetting(catchWebConfig)
+    }
+    else {
+      const res = await getConfigByNameAsync('webMobileConfig')
+      if (res.setting) {
+        useStore.set(APP_WEB_CONFIG_KEY, res)
+        setSetting(res.setting)
+      }
+    }
+
+    isInitialized.value = true
+  }
+
+  return {
+    setSetting,
+    getSetting,
+    init, // 导出 init 方法
+    isInitialized,
+  }
+})
+
+export default useSettingStore