af-mobile-client-vue3 1.4.51 → 1.4.53

package/src/components/data/UserDetail/types.ts

@@ -23,4 +23,4 @@ export interface ConfigItem {
   format?: (value: string | number) => string
   template?: string
   condition?: (data: any) => boolean
-}
+}

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

@@ -13,6 +13,7 @@ import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { getDict } from '@af-mobile-client-vue3/utils/dictUtil'
 import { mobileUtil } from '@af-mobile-client-vue3/utils/mobileUtil'
 import { executeStrFunctionByContext } from '@af-mobile-client-vue3/utils/runEvalFunction'
+import * as util from '@af-mobile-client-vue3/utils/util'
 import { areaList } from '@vant/area-data'
 import dayjs from 'dayjs/esm/index'
 import { debounce } from 'lodash-es'
@@ -193,7 +194,7 @@ const currInst = getCurrentInstance()
 // 配置中心->表单项变更触发函数
 async function dataChangeFunc() {
   if (attr.dataChangeFunc) {
-    await executeStrFunctionByContext(currInst, attr.dataChangeFunc, [props.form, (formData: any) => emits('setForm', formData), attr, null, mode, runLogic, getConfigByNameAsync, userState.f.resources])
+    await executeStrFunctionByContext(currInst, attr.dataChangeFunc, [props.form, (formData: any) => emits('setForm', formData), attr, util, mode, runLogic, getConfigByNameAsync, userState.f.resources, dayjs])
   }
 }
 const dataChangeFuncdebounce = debounce(dataChangeFunc, 300)
@@ -433,8 +434,15 @@ function updateFile(files, _index) {
   modelData.value = files
 }
 
+// 是否只读
+const readonly = computed(() => {
+  return props.formReadonly || attr.addOrEdit === 'readonly' || mode === '预览' || customizeReadOnly.value
+})
+
 // 表单校验的类型校验
 function formTypeCheck(attr, value) {
+  if (readonly.value)
+    return
   if (mode === '查询' || mode === '预览')
     return
   // if (!attr.rule || !attr.rule.required || attr.rule.required === 'false')
@@ -581,11 +589,6 @@ const labelAlign = computed(() => {
   return props.labelAlign || attr.labelAlign || 'left'
 })
 
-// 是否只读
-const readonly = computed(() => {
-  return props.formReadonly || attr.addOrEdit === 'readonly' || mode === '预览' || customizeReadOnly.value
-})
-
 // 判断是否显示空提示（只读且值为空）
 const showEmptyTip = computed(() => {
   if ((attr.type === 'image' || attr.type === 'file') && props.formReadonly) {

package/src/components/data/XReportGrid/XAddReport/index.ts

@@ -7,4 +7,4 @@ export default {
   install(app: App) {
     app.component('XAddReport', XAddReport)
   },
-}
+}

package/src/components/data/XReportGrid/XReportDrawer/index.ts

@@ -7,4 +7,4 @@ export default {
   install(app: App) {
     app.component('XReportDrawer', XReportDrawer)
   },
-}
+}

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

@@ -1,10 +1,10 @@
-<script setup lang="ts">
-</script>
-
-<template>
-  <VanTag />
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script setup lang="ts">
+</script>
+
+<template>
+  <VanTag />
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/components/layout/TabBarLayout/index.vue

@@ -1,40 +1,40 @@
-<script setup lang="ts">
-import {
-  Tabbar as VanTabbar,
-  TabbarItem as VanTabbarItem,
-} from 'vant'
-import { defineProps } from 'vue'
-
-const { barList, callbacks } = defineProps<{
-  barList?: Array<{ icon: string, text: string, method: string }>
-  callbacks?: object
-}>()
-
-function handleClick(index) {
-  const methodName = (barList[index] as any).method
-  callbacks[methodName]()
-}
-</script>
-
-<template>
-  <VanTabbar class="van-bar">
-    <VanTabbarItem v-for="(item, index) in barList" :key="index" :icon="(item as any).icon" @click="handleClick(index)">
-      {{ (item as any).text }}
-    </VanTabbarItem>
-  </VanTabbar>
-</template>
-
-<style scoped lang="less">
-.van-bar {
-  height: 8vh;
-  background-color: #f7f8fa;
-  color: black;
-}
-.van-tabbar-item:hover {
-  color: var(--van-text-color-2);
-}
-:deep(.van-tabbar-item--active) {
-  background-color: #f7f8fa;
-  color: black;
-}
-</style>
+<script setup lang="ts">
+import {
+  Tabbar as VanTabbar,
+  TabbarItem as VanTabbarItem,
+} from 'vant'
+import { defineProps } from 'vue'
+
+const { barList, callbacks } = defineProps<{
+  barList?: Array<{ icon: string, text: string, method: string }>
+  callbacks?: object
+}>()
+
+function handleClick(index) {
+  const methodName = (barList[index] as any).method
+  callbacks[methodName]()
+}
+</script>
+
+<template>
+  <VanTabbar class="van-bar">
+    <VanTabbarItem v-for="(item, index) in barList" :key="index" :icon="(item as any).icon" @click="handleClick(index)">
+      {{ (item as any).text }}
+    </VanTabbarItem>
+  </VanTabbar>
+</template>
+
+<style scoped lang="less">
+.van-bar {
+  height: 8vh;
+  background-color: #f7f8fa;
+  color: black;
+}
+.van-tabbar-item:hover {
+  color: var(--van-text-color-2);
+}
+:deep(.van-tabbar-item--active) {
+  background-color: #f7f8fa;
+  color: black;
+}
+</style>

package/src/hooks/useCommon.ts

@@ -1,9 +1,9 @@
-export function formatDate(date) {
-  const year = date.getFullYear()
-  const month = (date.getMonth() + 1).toString().padStart(2, '0') // 月份加1，并补零
-  const day = date.getDate().toString().padStart(2, '0') // 日期补零
-  const hours = date.getHours().toString().padStart(2, '0') // 小时补零
-  const minutes = date.getMinutes().toString().padStart(2, '0') // 分钟补零
-  const seconds = date.getSeconds().toString().padStart(2, '0') // 秒数补零
-  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
-}
+export function formatDate(date) {
+  const year = date.getFullYear()
+  const month = (date.getMonth() + 1).toString().padStart(2, '0') // 月份加1，并补零
+  const day = date.getDate().toString().padStart(2, '0') // 日期补零
+  const hours = date.getHours().toString().padStart(2, '0') // 小时补零
+  const minutes = date.getMinutes().toString().padStart(2, '0') // 分钟补零
+  const seconds = date.getSeconds().toString().padStart(2, '0') // 秒数补零
+  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+}

package/src/plugins/AppData.ts

@@ -1,38 +1,38 @@
-import type { App } from 'vue'
-import { manageApi } from '@af-mobile-client-vue3/services/api/manage'
-import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
-import { handleTree } from '@af-mobile-client-vue3/utils/dataUtil'
-import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
-import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
-
-const Storage = createStorage({ storage: localStorage })
-
-export const GetAppDataService = {
-  install(app: App<Element>) {
-    app.provide('$appdata', GetAppDataService)
-  },
-  async load() {
-  },
-  // 返回树形省市区
-  async getDivisionsOhChinaForTree() {
-    // 获取省市区数据
-    return new Promise((resolve, reject) => {
-      try {
-        indexedDB.getByWeb('divisionsOhChina', manageApi.getDivisionsOhChina, {}, (res) => {
-          resolve(res)
-        }, (processRes) => {
-          return handleTree(processRes, 'code', 'parentcode', null)
-        })
-      }
-      catch (e) {
-        reject(e)
-      }
-    })
-  },
-  getWebConfigByKey(key: string) {
-    const object = Storage.get(APP_WEB_CONFIG_KEY)
-    return object[key]
-  },
-}
-
-export default GetAppDataService
+import type { App } from 'vue'
+import { manageApi } from '@af-mobile-client-vue3/services/api/manage'
+import { APP_WEB_CONFIG_KEY } from '@af-mobile-client-vue3/stores/mutation-type'
+import { handleTree } from '@af-mobile-client-vue3/utils/dataUtil'
+import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
+import { createStorage } from '@af-mobile-client-vue3/utils/Storage'
+
+const Storage = createStorage({ storage: localStorage })
+
+export const GetAppDataService = {
+  install(app: App<Element>) {
+    app.provide('$appdata', GetAppDataService)
+  },
+  async load() {
+  },
+  // 返回树形省市区
+  async getDivisionsOhChinaForTree() {
+    // 获取省市区数据
+    return new Promise((resolve, reject) => {
+      try {
+        indexedDB.getByWeb('divisionsOhChina', manageApi.getDivisionsOhChina, {}, (res) => {
+          resolve(res)
+        }, (processRes) => {
+          return handleTree(processRes, 'code', 'parentcode', null)
+        })
+      }
+      catch (e) {
+        reject(e)
+      }
+    })
+  },
+  getWebConfigByKey(key: string) {
+    const object = Storage.get(APP_WEB_CONFIG_KEY)
+    return object[key]
+  },
+}
+
+export default GetAppDataService

package/src/router/invoiceRoutes.ts

@@ -1,33 +1,33 @@
-import type { RouteRecordRaw } from 'vue-router'
-import PageLayout from '@af-mobile-client-vue3/layout/PageLayout.vue'
-import NotFound from '@af-mobile-client-vue3/views/common/NotFound.vue'
-import invoiceShow from '@af-mobile-client-vue3/views/invoiceShow/index.vue'
-
-const routes: Array<RouteRecordRaw> = [
-  {
-    path: '/',
-    name: 'root',
-    component: PageLayout,
-    redirect: { name: 'Component' },
-    children: [
-      {
-        path: '/invoiceShow',
-        name: 'invoiceShow',
-        component: invoiceShow,
-      },
-    ],
-  },
-  {
-    path: '/404',
-    name: '404',
-    component: NotFound,
-  },
-  {
-    path: '/:pathMatch(.*)',
-    redirect: {
-      name: '404',
-    },
-  },
-]
-
-export default routes
+import type { RouteRecordRaw } from 'vue-router'
+import PageLayout from '@af-mobile-client-vue3/layout/PageLayout.vue'
+import NotFound from '@af-mobile-client-vue3/views/common/NotFound.vue'
+import invoiceShow from '@af-mobile-client-vue3/views/invoiceShow/index.vue'
+
+const routes: Array<RouteRecordRaw> = [
+  {
+    path: '/',
+    name: 'root',
+    component: PageLayout,
+    redirect: { name: 'Component' },
+    children: [
+      {
+        path: '/invoiceShow',
+        name: 'invoiceShow',
+        component: invoiceShow,
+      },
+    ],
+  },
+  {
+    path: '/404',
+    name: '404',
+    component: NotFound,
+  },
+  {
+    path: '/:pathMatch(.*)',
+    redirect: {
+      name: '404',
+    },
+  },
+]
+
+export default routes

package/src/services/api/common.ts

@@ -1,109 +1,109 @@
-import { del, post, postWithConfig } from '@af-mobile-client-vue3/services/restTools'
-import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
-
-const commonApi = {
-  // 获取配置
-  getConfig: 'logic/openapi/getLiuliConfiguration',
-  // 通用查询
-  query: 'logic/commonQuery',
-  // 编辑前查询
-  queryWithResource: 'logic/commonQueryWithResource',
-  // 通用新增/修改
-  addOrModify: 'logic/commonAddOrModify',
-  // 通用删除
-  delete: 'logic/commonDelete',
-}
-
-/**
- * 根据配置名获取配置内容
- * @param configName 配置名称
- * @param callback 回调函数
- */
-export function getConfigByName(configName: string, callback: Function): void
-export function getConfigByName(configName: string, callback: Function, serviceName: string): void
-/**
- * 根据配置名获取配置内容
- * @param configName 配置名称
- * @param callback 回调函数
- * @param serviceName 服务名
- */
-export function getConfigByName(configName: string, callback: Function, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): void {
-  indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, callback, null)
-}
-
-export async function getConfigByNameAsync(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<any> {
-  return new Promise((resolve, reject) => {
-    indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, resolve, null)
-  })
-}
-
-/**
- * 临时使用
- * 获取琉璃配置，不走indexedDB缓存
- * @param configName
- * @param serviceName
- */
-export function getConfigByNameWithoutIndexedDB(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.getConfig}`, { configName })
-}
-
-/**
- * 通用执行业务逻辑
- */
-export function runLogic<T>(logicName: string, parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<T> {
-  return post<T>(`/${serviceName}/logic/${logicName}`, parameter)
-}
-
-/**
- * 通用查询
- */
-export function query(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.query}`, parameter)
-}
-
-/**
- * 编辑前查询
- */
-export function queryWithResource(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.queryWithResource}`, parameter)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModify(parameter: object, tableName = 't_files', serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/entity/${tableName}`, parameter)
-}
-
-/**
- * 通用新增/修改
- */
-export function addOrModifyEntity(parameter: object, tableName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/entity/save/${tableName}`, parameter)
-}
-
-/**
- * 通用删除
- */
-export function remove(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/${commonApi.delete}`, parameter)
-}
-
-/**
- * @description: 上传
- */
-export function upload(parameter, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME, config) {
-  return postWithConfig(`/${serviceName}/resource/upload`, parameter, config)
-}
-
-/**
- * @description: 删除
- */
-export function deleteFile(data, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return del(`/${serviceName}/entity/t_files`, data)
-}
-
-export function openApiLogic(parameter, logicName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
-  return post(`/${serviceName}/logic/openapi/${logicName}`, parameter)
-}
-export { commonApi }
+import { del, post, postWithConfig } from '@af-mobile-client-vue3/services/restTools'
+import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
+
+const commonApi = {
+  // 获取配置
+  getConfig: 'logic/openapi/getLiuliConfiguration',
+  // 通用查询
+  query: 'logic/commonQuery',
+  // 编辑前查询
+  queryWithResource: 'logic/commonQueryWithResource',
+  // 通用新增/修改
+  addOrModify: 'logic/commonAddOrModify',
+  // 通用删除
+  delete: 'logic/commonDelete',
+}
+
+/**
+ * 根据配置名获取配置内容
+ * @param configName 配置名称
+ * @param callback 回调函数
+ */
+export function getConfigByName(configName: string, callback: Function): void
+export function getConfigByName(configName: string, callback: Function, serviceName: string): void
+/**
+ * 根据配置名获取配置内容
+ * @param configName 配置名称
+ * @param callback 回调函数
+ * @param serviceName 服务名
+ */
+export function getConfigByName(configName: string, callback: Function, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): void {
+  indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, callback, null)
+}
+
+export async function getConfigByNameAsync(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<any> {
+  return new Promise((resolve, reject) => {
+    indexedDB.getByWeb(configName, `/${serviceName}/${commonApi.getConfig}`, { configName }, resolve, null)
+  })
+}
+
+/**
+ * 临时使用
+ * 获取琉璃配置，不走indexedDB缓存
+ * @param configName
+ * @param serviceName
+ */
+export function getConfigByNameWithoutIndexedDB(configName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.getConfig}`, { configName })
+}
+
+/**
+ * 通用执行业务逻辑
+ */
+export function runLogic<T>(logicName: string, parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME): Promise<T> {
+  return post<T>(`/${serviceName}/logic/${logicName}`, parameter)
+}
+
+/**
+ * 通用查询
+ */
+export function query(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.query}`, parameter)
+}
+
+/**
+ * 编辑前查询
+ */
+export function queryWithResource(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.queryWithResource}`, parameter)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModify(parameter: object, tableName = 't_files', serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/entity/${tableName}`, parameter)
+}
+
+/**
+ * 通用新增/修改
+ */
+export function addOrModifyEntity(parameter: object, tableName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/entity/save/${tableName}`, parameter)
+}
+
+/**
+ * 通用删除
+ */
+export function remove(parameter: object, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/${commonApi.delete}`, parameter)
+}
+
+/**
+ * @description: 上传
+ */
+export function upload(parameter, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME, config) {
+  return postWithConfig(`/${serviceName}/resource/upload`, parameter, config)
+}
+
+/**
+ * @description: 删除
+ */
+export function deleteFile(data, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return del(`/${serviceName}/entity/t_files`, data)
+}
+
+export function openApiLogic(parameter, logicName: string, serviceName = import.meta.env.VITE_APP_SYSTEM_NAME) {
+  return post(`/${serviceName}/logic/openapi/${logicName}`, parameter)
+}
+export { commonApi }

package/src/services/api/manage.ts

@@ -1,8 +1,8 @@
-const manageApi = {
-  // 查询：获取省市区街道三级分类
-  getDivisionsOhChina: '/af-system/logic/getDivisionsOhChina',
-}
-
-export {
-  manageApi,
-}
+const manageApi = {
+  // 查询：获取省市区街道三级分类
+  getDivisionsOhChina: '/af-system/logic/getDivisionsOhChina',
+}
+
+export {
+  manageApi,
+}

package/src/services/api/search.ts

@@ -1,16 +1,16 @@
-import { post } from '@af-mobile-client-vue3/services/restTools'
-
-export async function getUserPermissions(userid: string) {
-  interface permissions {
-    name: string
-  }
-
-  const res = await post<permissions[]>(`/af-system/search`, {
-    source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
-    userid,
-  })
-
-  return res.map((row) => {
-    return row.name
-  })
-}
+import { post } from '@af-mobile-client-vue3/services/restTools'
+
+export async function getUserPermissions(userid: string) {
+  interface permissions {
+    name: string
+  }
+
+  const res = await post<permissions[]>(`/af-system/search`, {
+    source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
+    userid,
+  })
+
+  return res.map((row) => {
+    return row.name
+  })
+}