af-mobile-client-vue3 1.1.12 → 1.1.14

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "af-mobile-client-vue3",
   "type": "module",
-  "version": "1.1.12",
+  "version": "1.1.14",
   "description": "Vue + Vite component lib",
   "license": "MIT",
   "engines": {

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

@@ -212,8 +212,8 @@ function onLoad() {
       pageSize,
       conditionParams: {
         $queryValue: searchVal,
-        ...conditionParams.value,
         ...fixQueryForm,
+        ...conditionParams.value,
       },
       sortField: orderVal?.value,
       sortOrder: sortordVal?.value,

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

@@ -388,6 +388,7 @@ const formatDate = date => `${date.getFullYear()}-${date.getMonth() + 1}-${date.
 
 function onCalendarConfirm(values) {
   localValue.value = [formatDate(values[0]), formatDate(values[1])]
+  pickerValue.value = `${formatDate(values[0])} ~ ${formatDate(values[1])}`
   calendarShow.value = false
 }
 
@@ -446,7 +447,7 @@ function init() {
     }
     if (attr.queryFormDefault) {
       // console.log(querySelectDefaultValue.value)
-      querySelectDefaultValue.value.push(attr.queryFormDefault)
+      querySelectDefaultValue.value.push(...attr.queryFormDefault)
       // querySelectDefaultValue.value = attr.queryFormDefault
     }
   }
@@ -806,7 +807,7 @@ function handleAddressConfirm(location) {
     <!-- 日历选择-查询 -->
     <VanField
       v-if="attr.type === 'rangePicker' && mode === '查询' && showItem"
-      v-model="(localValue as string | number)"
+      v-model="(pickerValue as string | number)"
       is-link
       readonly
       name="rangePicker"

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,11 +1,13 @@
 <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()
 // 获取默认值
@@ -89,6 +91,7 @@ function addOption(callback) {
 
 // 修改功能
 function updateRow(result, callback) {
+  console.log('用户----', userInfo)
   router.push({
     name: 'XFormGroupView',
     // params: { id: result.o_id, openid: result.o_id },
@@ -118,6 +121,7 @@ function deleteRow(result) {
         :config-name="configName"
         :service-name="serviceName"
         :id-key="idKey"
+        :fix-query-form="{ u_f_price_state: ['生效', '待生效'] }"
         @to-detail="toDetail"
         @delete-row="deleteRow"
         @update="updateRow"

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

@@ -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中没有返回 权限 需要主动获取权限列表