af-mobile-client-vue3 1.1.11 → 1.1.13

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

@@ -228,7 +228,7 @@ function confirmOption() {
     const isEmptyObject = Object.keys(conditionParams.value).length === 0
     emit('update:conditionParams', isEmptyObject ? undefined : conditionParams.value)
     emit('onRefresh', {})
-    listFilterMenu.value.toggle(false)
+    listFilterMenu.value.close(false)
   }
 }
 
@@ -265,6 +265,10 @@ function handleCloseScanButton() {
 
           <!-- 显示选项卡 -->
           <div class="scan-tab-wrapper">
+            <div class="dropdown-title">
+              <VanIcon name="scan" class="title-icon" />
+              <span class="title-text">扫码功能</span>
+            </div>
             <div class="scan-tabs">
               <!-- 动态生成扫描模式选项卡 -->
               <div
@@ -308,6 +312,10 @@ function handleCloseScanButton() {
               <VanIcon name="filter-o" size="24" class="filter-icon" />
             </div>
           </template>
+          <div class="dropdown-title">
+            <VanIcon name="filter-o" class="title-icon" />
+            <span class="title-text">筛选条件</span>
+          </div>
           <div class="order-condition">
             <template v-if="props.orderList.length > 0">
               <VanRow justify="space-between" class="filter-title">
@@ -374,14 +382,35 @@ function handleCloseScanButton() {
     gap: 8px;
   }
 
+  .dropdown-title {
+    padding: 16px;
+    background-color: #fff;
+    border-bottom: 1px solid #ebedf0;
+    margin-bottom: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    .title-icon {
+      font-size: 20px;
+      color: #646566;
+    }
+    .title-text {
+      font-size: 18px;
+      font-weight: 600;
+      color: #323233;
+      line-height: 1.4;
+    }
+  }
+
   .scan-tab-wrapper {
-    padding: 12px 16px;
+    padding: 0;
     background-color: #fff;
     .scan-tabs {
       display: flex;
       background: #f5f5f5;
       border-radius: 8px;
       padding: 2px;
+      margin-top: 8px;
       .scan-tab-item {
         flex: 1;
         height: 44px;
@@ -413,21 +442,37 @@ function handleCloseScanButton() {
     :deep(.van-dropdown-menu__bar) {
       box-shadow: none;
       height: auto;
+      position: relative;
+      z-index: 1;
     }
     :deep(.van-dropdown-menu__item) {
       display: flex;
       align-items: center;
       justify-content: center;
+      position: relative;
+      z-index: 1;
     }
     // 隐藏下拉箭头
     :deep(.van-dropdown-menu__title::after) {
       display: none !important;
     }
+    // 下拉菜单内容
+    :deep(.van-dropdown-item__content) {
+      position: fixed;
+      z-index: 10;
+      background-color: white;
+    }
+    // 下拉菜单遮罩层
+    :deep(.van-overlay) {
+      z-index: 9
+    }
   }
 
   .filter-icon {
     color: #333;
     background-color: rgba(245,245,245);
+    position: relative;
+    z-index: 1;
   }
 
   .filter-icon-box {
@@ -439,12 +484,14 @@ function handleCloseScanButton() {
     border-radius: 10px;
     background-color: rgba(245,245,245);
     cursor: pointer;
+    position: relative;
+    z-index: 1;
     &:active {
       opacity: 0.7;
     }
   }
   .order-condition {
-    // padding-bottom: 10px;
+    padding: 0 16px 16px;
     max-height: calc(var(--van-picker-toolbar-height) + var(--van-padding-base) + var(--van-tabs-line-height) + 35vh);
     overflow-y: auto;
     width: 100%;

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

@@ -232,6 +232,8 @@ function updateFile(files, _index) {
 
 // 表单校验的类型校验
 function formTypeCheck(attr, value) {
+  if (this.mode === '查询')
+    return
   switch (attr.rule.type) {
     case 'string':
       if (value.length === 0) {

package/src/router/index.ts

@@ -1,11 +1,11 @@
 import type { RouteLocationNormalized } from 'vue-router'
 import routes from '@af-mobile-client-vue3/router/routes'
+import useRouteCache from '@af-mobile-client-vue3/stores/modules/routeCache'
 import useRouteTransitionNameStore from '@af-mobile-client-vue3/stores/modules/routeTransitionName'
 import setPageTitle from '@af-mobile-client-vue3/utils/set-page-title'
 // https://router.vuejs.org/zh/
 import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
 import 'nprogress/nprogress.css'
-import useRouteCache from "@af-mobile-client-vue3/stores/modules/routeCache";
 
 const baseUrl = import.meta.env.VITE_APP_PUBLIC_PATH
 // 创建路由实例并传递 `routes` 配置
@@ -49,7 +49,7 @@ router.beforeEach((to: toRouteType, _from: toRouteType, next) => {
   }
   routeTransitionNameStore.setName(name)
   // 路由缓存
-  useRouteCache.addRoute(to)
+  useRouteCache().addRoute(to)
   // 页面 title
   setPageTitle(to.meta.title)
   next()

package/src/stores/modules/user.ts

@@ -24,6 +24,10 @@ export interface UserInfo {
   avatar: string
   functions: Array<any>
   rolestr: string
+  f_operator: string
+  f_operatorid: string
+  f_orgid: string
+  f_orgname: string
 }
 
 interface IUserState {

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

@@ -1,19 +1,23 @@
 <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('crud_oper_log_manage')
-const serviceName = ref('af-system')
+// const configName = ref('orderCarInMobileCRUD')
+// const serviceName = ref('af-gaslink')
+const configName = ref('lngPriceManageMobileCRUD')
+const serviceName = ref('af-gaslink')
 
 // 资源权限测试
 // const configName = ref('crud_sources_test')
@@ -49,11 +53,11 @@ const serviceName = ref('af-system')
 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 +73,40 @@ function toDetail(item) {
 //     },
 //   })
 // }
+function addOption(callback) {
+  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, callback) {
+  console.log('用户----', userInfo)
+  router.push({
+    name: 'XFormGroupView',
+    // params: { id: result.o_id, openid: result.o_id },
+    // query: {
+    //   configName: configName.value,
+    //   serviceName: serviceName.value,
+    //   mode: '修改',
+    // },
+  })
+
+  // 如果存在回调函数，调用它并传递true表示已处理
+  if (typeof callback === 'function') {
+    callback(true)
+  }
+}
 
 // 删除功能
 function deleteRow(result) {
@@ -95,11 +120,20 @@ function deleteRow(result) {
       <XCellList
         :config-name="configName"
         :service-name="serviceName"
-        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
         :id-key="idKey"
         @to-detail="toDetail"
         @delete-row="deleteRow"
+        @update="updateRow"
+        @add="addOption"
       />
+      <!--      <XCellList -->
+      <!--        :config-name="configName" -->
+      <!--        :service-name="serviceName" -->
+      <!--        :fix-query-form="{ o_f_oper_name: 'edu_test' }" -->
+      <!--        :id-key="idKey" -->
+      <!--        @to-detail="toDetail" -->
+      <!--        @delete-row="deleteRow" -->
+      <!--      /> -->
     </template>
   </NormalDataLayout>
 </template>

package/src/views/user/login/LoginForm.vue

@@ -44,13 +44,13 @@ const formData = reactive({
 const route = useRoute()
 const setting = useSettingStore()
 
-const getShow = computed(() => (unref(getLoginState) === LoginStateEnum.LOGIN) && !isWechat())
+const getShow = computed(() => (unref(getLoginState) === LoginStateEnum.LOGIN))
 
 const login: any = inject('$login')
 onBeforeMount(async () => {
   if (isWechat()) {
     // 检测是否要开放微信登录
-    if (setting.getSetting()?.wechatLogin || true) {
+    if (setting.getSetting()?.wechatLogin) {
       try {
         wxloading.value = true
         if (route.query.code && route.query.state) {
@@ -159,6 +159,7 @@ function closeWindows() {
 }
 
 async function afterGeneral(result) {
+  console.log('用户根本---', result)
   const user: UserInfo = {
     id: result.id,
     username: result.ename,
@@ -167,6 +168,10 @@ async function afterGeneral(result) {
     avatar: result.avatar ? result.avatar : setting.getSetting()?.defaultAvatarUrl,
     functions: result.functions,
     rolestr: result.rolestr,
+    f_operator: result.name,
+    f_operatorid: result.id,
+    f_orgid: result.orgid,
+    f_orgname: result.orgs,
   }
   userState.setUserInfo(user)
   // 如果result中没有返回 权限 需要主动获取权限列表