af-mobile-client-vue3 1.2.14 → 1.2.16

package/package.json

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

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

@@ -382,11 +382,11 @@ async function onSubmit() {
     const realForm = handleFormKeys(requestForm)
     try {
       addOrModifyEntity(realForm, tableName.value, props.serviceName || import.meta.env.VITE_APP_SYSTEM_NAME).then(() => {
-        showSuccessToast('提交成功！')
+        showSuccessToast('提交成功!！')
       })
     }
     catch (error) {
-      showFailToast('提交失败！')
+      showFailToast('提交失败!！')
     }
     finally {
       setTimeout(() => {

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/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 ['', '']
+}

package/src/views/component/XCellListView/index.vue

@@ -1,19 +1,26 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
 import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { defineEmits, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
 // 定义事件
 const emit = defineEmits(['deleteRow'])
+const userInfo = useUserStore().getUserInfo()
 // 访问路由
 const router = useRouter()
 // 获取默认值
 const idKey = ref('o_id')
 
 // 简易crud表单测试
-const configName = ref('lngChargeAuditMobileCRUD')
+// const configName = ref('orderCarInMobileCRUD')
+// const serviceName = ref('af-gaslink')
+// const configName = ref('lngPriceManageMobileCRUD')
+const configName = ref('测试2')
 const serviceName = ref('af-gaslink')
+// const configName = ref('mobile_liushuiQueryCRUD')
+// const serviceName = ref('af-revenue')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -49,11 +56,11 @@ const serviceName = ref('af-gaslink')
 function toDetail(item) {
   router.push({
     name: 'XFormGroupView',
-    query: {
-      id: item[idKey.value],
-      // id: item.rr_id,
-      // o_id: item.o_id,
-    },
+    // query: {
+    //   id: item[idKey.value],
+    // id: item.rr_id,
+    // o_id: item.o_id,
+    // },
   })
 }
 
@@ -69,19 +76,35 @@ function toDetail(item) {
 //     },
 //   })
 // }
+function addOption() {
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: totalCount.value },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '新增',
+    // },
+  })
+  // 如果存在回调函数，调用它并传递true表示已处理
+  // if (typeof callback === 'function') {
+  //   callback(true)
+  // }
+}
 
 // 修改功能
-// function updateRow(result) {
-//   router.push({
-//     name: 'XFormView',
-//     params: { id: result.o_id, openid: result.o_id },
-//     query: {
-//       configName: configName.value,
-//       serviceName: serviceName.value,
-//       mode: '修改',
-//     },
-//   })
-// }
+function updateRow(result) {
+  console.log('用户----', userInfo)
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: result.o_id, openid: result.o_id },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '修改',
+    // },
+  })
+}
 
 // 删除功能
 function deleteRow(result) {
@@ -92,11 +115,23 @@ function deleteRow(result) {
 <template>
   <NormalDataLayout id="XCellListView" title="工作计划">
     <template #layout_content>
+      <!--      <XCellList -->
+      <!--        :config-name="configName" -->
+      <!--        :service-name="serviceName" -->
+      <!--        :custom-add="true" -->
+      <!--        :custom-edit="true" -->
+      <!--        :id-key="idKey" -->
+      <!--        @to-detail="toDetail" -->
+      <!--        @delete-row="deleteRow" -->
+      <!--        @update="updateRow" -->
+      <!--        @add="addOption" -->
+      <!--      /> -->
+
+      <!--      :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }" -->
+
       <XCellList
-        :config-name="configName"
-        :service-name="serviceName"
-        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
-        :id-key="idKey"
+        config-name="小小测试CRUD"
+        service-name="af-apply"
         @to-detail="toDetail"
         @delete-row="deleteRow"
       />

package/src/views/component/XFormGroupView/index.vue

@@ -5,16 +5,19 @@ import { showDialog } from 'vant'
 import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 
+// const configName = ref('reviewFormGroup')
+// const serviceName = ref('af-revenue')
+
 // 纯表单
-const configName = ref('form_check_test')
-const serviceName = ref('af-system')
+// const configName = ref('form_check_test')
+// const serviceName = ref('af-system')
 
 // const configName = ref("计划下发Form")
 // const serviceName = ref("af-linepatrol")
 
 // 表单组
-// const configName = ref('lngChargeAuditMobileFormGroup')
-// const serviceName = ref('af-gaslink')
+const configName = ref('lngChargeAuditMobileFormGroup')
+const serviceName = ref('af-gaslink')
 
 const formData = ref({})
 const formGroup = ref(null)