@yxhl/specter-pui-vtk 1.0.110 → 1.0.112

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yxhl/specter-pui-vtk",
-  "version": "1.0.110",
+  "version": "1.0.112",
   "description": "雅心互联 Vue 3 + Vuetify3 组件库",
   "type": "module",
   "main": "./dist/specter-pui.umd.js",

package/src/components/assembly/VtkDept.vue

@@ -10,6 +10,10 @@ console.log('window.VTK_CONFIG?.storageKeys?.user', window.VTK_CONFIG?.storageKe
 console.log('user', user)
 const pause = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 
+// 字段命名兼容：不同环境的用户信息 / 接口返回可能是 areacode 或 areaCode
+const pickAreaCode = (obj) => obj?.areaCode || obj?.areacode || '';
+const pickAreaName = (obj) => obj?.areaName || obj?.areaname || '';
+
 // 定义 props - 控制是否支持多选
 const props = defineProps({
   multiple: {
@@ -46,13 +50,13 @@ watch(areaSelectedData, (newVal, oldVal) => {
 
 // 获取地区列表
 const getAreaList = () => {
-  if (user && user.areacode) {
-    proxy.$vtk.request.getForm(`/dict/area/show/${user.areacode}`).then((res) => {
-       console.log('res=', res);
+  const userAreaCode = pickAreaCode(user);
+  if (userAreaCode) {
+    proxy.$vtk.request.getForm(`/dict/area/show/${userAreaCode}`).then((res) => {
       if (res && res.data) {
         areaData.value = [{
-          areaCode: res.data.areaCode,
-          areaName: res.data.areaName,
+          areaCode: pickAreaCode(res.data),
+          areaName: pickAreaName(res.data),
           children: []
         }];
       }
@@ -63,10 +67,13 @@ const getAreaList = () => {
 // 获取下级地区列表
 const getAreaNextList = async (item) => {
   await pause(300);
-  const parentCode = item.areaCode;
+  const parentCode = pickAreaCode(item);
   proxy.$vtk.request.getForm(`/dict/area/next/${parentCode}`).then((res) => {
     if (res && res.data) {
       res.data.forEach((it) => {
+        // 统一成 areaCode / areaName，避免后端返回 areacode 时树取值取不到
+        it.areaCode = pickAreaCode(it);
+        it.areaName = pickAreaName(it);
         it.areaLeve < 12 && (it.children = []);
         item.children.push(it);
       });

package/src/components/assembly/VtkPage.vue

@@ -21,7 +21,7 @@
           @update:model-value="pageChange()"
         />
       </span>
-      <span class="page-total ml-3 d-none d-md-flex align-center">到</span>
+      <span class="page-total ml-1 d-none d-md-flex align-center">到</span>
       <VTextField
         v-model="pagination.pageno"
         variant="outlined"
@@ -140,7 +140,7 @@ const pageChange = () => {
 }
 .page-select {
   padding-top: 4px;
-  max-width: 115px;
+  max-width: 120px;
   :deep(.v-input__control) {
     min-height: 36px !important;
     height: 36px !important;
@@ -157,6 +157,7 @@ const pageChange = () => {
 }
 .page-go {
   max-width: 75px;
+  padding-top: 4px;
   :deep(.v-input__control) {
     min-height: 36px !important;
     height: 36px !important;

package/src/components/assembly/VtkSearch.vue

@@ -28,8 +28,8 @@
               size="small"
               @click.stop="search"
             >mdi-magnify</VIcon>
-            <span class="search-divider"></span>
-            <span class="search-advanced">
+            <span v-bind="props" class="search-advanced">
+              <span class="search-divider"></span>
               <VBadge
                 dot
                 :content="initialIndex"
@@ -38,7 +38,6 @@
                 class="advanced-badge"
               >
                 <span
-                  v-bind="props"
                   class="pl-1 text-blue vtk-cursor-pointer d-inline-flex align-center text-body-2"
                 >
                   高级
@@ -271,12 +270,20 @@ defineExpose({ search, reset });
 }
 
 :deep(.advanced-badge .v-badge__badge) {
-  transform: translate(10px, -2px);
+  transform: translate(8px, -2px);
 }
 
 .search-advanced {
   flex-shrink: 0;
   white-space: nowrap;
+  display: inline-flex;
+  align-items: center;
+  align-self: stretch;
+  /* 热区铺满「放大镜右侧 → 输入框右内缘」整段：左侧 4px 补图标外边距，右侧 12px 补
+     .v-field--appended 的 padding-inline-end；负外边距抵消 padding，视觉与布局保持原样 */
+  padding: 1px 12px 0 4px;
+  margin: 0 -12px 0 -4px;
+  cursor: pointer;
 }
 
 .search-divider {