af-mobile-client-vue3 1.1.18 → 1.1.20

package/package.json

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

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

@@ -578,6 +578,7 @@ function evaluateCustomFunction(funcString: string | undefined, record: any, ind
   height: calc(94vh - var(--van-nav-bar-height) - 5px);
   --van-search-padding:5px;
   --van-dropdown-menu-title-padding: 5px;
+  --van-cell-vertical-padding: 0px;
   .main {
     overflow-y: auto;
     height: 100%;

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

@@ -501,7 +501,7 @@ function handleCloseScanButton() {
       font-size: 13px;
       font-weight: 600;
       line-height: 2rem;
-      margin: 5px 1rem 1px 1rem;
+      margin: 5px 5px 1px 8px;
       color: black;
     }
     .range-picker-list {

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

@@ -116,8 +116,14 @@ const formSelectDefaultValue = ref([])
 // 选择-查询
 const querySelectDefaultValue = ref([])
 
-// eslint-disable-next-line ts/no-use-before-define
+// 登录信息 (可以在配置的动态函数中使用 this.setupState 获取到当前组件内的全部函数和变量 例：this.setupState.userState)
+const userState = useUserStore().getLogin()
 const currUser = computed(() => userState.f.resources.id)
+const userInfo = computed(() => ({
+  orgId: userState.f.resources.orgid,
+  userId: userState.f.resources.id,
+}))
+
 // 是否展示当前项
 const showItem = ref(true)
 
@@ -372,7 +378,7 @@ const labelData = computed(() => {
 })
 // 是否展示表单左侧label文字
 const labelAlign = computed(() => {
-  return attr.labelAlign ? attr.labelAlign : 'top'
+  return attr.labelAlign ? attr.labelAlign : 'left'
 })
 // 是否只读
 const readonly = computed(() => {
@@ -385,8 +391,6 @@ const placeholder = computed(() => {
   else
     return attr.placeholder ? attr.placeholder : `请选择${attr.name}`
 })
-// 登录信息 (可以在配置的动态函数中使用 this.setupState 获取到当前组件内的全部函数和变量 例：this.setupState.userState)
-const userState = useUserStore().getLogin()
 
 const formatDate = date => `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
 
@@ -504,8 +508,8 @@ function getData(value, callback) {
     // 调用logic前设置参数
     if (getDataParams && getDataParams[attr.model])
       Object.assign(value, getDataParams[attr.model])
-
-    runLogic(logic, value, serviceName).then((res) => {
+    Object.assign(value, userInfo.value)
+    runLogic(logic, value.value, serviceName).then((res) => {
       callback(res)
     })
   }