w-ui-v1 1.0.14 → 1.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "w-ui-v1",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "description": "w-ui",
   "author": "wgxshh",
   "license": "ISC",

package/utils/http.ts

@@ -24,8 +24,16 @@ export default function request(options: any): Promise<any> {
       responseType: 'json',
       // #endif
       success: (res: any) => {
+        console.log('request', res)
         // 判断状态
         if (res.statusCode >= 200 && res.statusCode < 300) {
+          if(res.data.message==='权限不足或没有资源'){
+            uni.showToast({ title:res.data.message, icon: 'none' })
+            uni.removeStorageSync('token')
+            uni.reLaunch({ url: '/pages/login/login' })
+            reject(res)
+            return
+          }
           resolve(res)
         }
         if (res.statusCode === 401) {
@@ -39,6 +47,12 @@ export default function request(options: any): Promise<any> {
           reject(res)
           // TODO 404
         }
+        if (res.statusCode === 405) {
+          uni.showToast({ title: '登录过期，请重新登录', icon: 'none' })
+          uni.removeStorageSync('token')
+          uni.reLaunch({ url: '/pages/login/login' })
+          // TODO 404
+        }
         if (res.statusCode === 500) {
           uni.showToast({ title: '服务器错误', icon: 'none' })
           reject(res)

package/w-card/utils/utils.ts

@@ -38,7 +38,7 @@ export function getValue(content: any, title: any): any {
       const obj = JSON.parse(content)
       
       // 图片链接
-      if (obj.base?.path && (obj.base?.type.includes('jpg') || obj.base?.type.includes('png'))) {
+      if (obj.base?.path && (obj.base?.type.includes('jpg') || obj.base?.type.includes('png')||obj.base?.type.includes('jpeg'))) {
   
         return {
           url: `${baseUrl}/v3/files${obj.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}`,

package/w-card/w-card.vue

@@ -4,7 +4,7 @@ import {
   defineProps,
   ref,
 } from 'vue'
-import { hasY,getValue } from './utils/utils'
+import { hasY, getValue } from './utils/utils'
 
 const props = defineProps({
   page: {
@@ -37,11 +37,11 @@ const items = computed(() => {
     return {
       title: item.title,
       content: props.itemData?.fieldMap[item.id],
-      data:props.itemData?.fieldMap[item.id],
+      data: props.itemData?.fieldMap[item.id],
       id: item.id,
       mstrucId: item.mstrucId,
       sourceId: item.sourceId,
-      buttons:item.buttons
+      buttons: item.buttons
     }
   }) || []
 })
@@ -64,8 +64,8 @@ function toggleExpand() {
 }
 
 // 跳转页页面
-function goto(type: string,item:any={},subItem:string='') {
-  
+function goto(type: string, item: any = {}, subItem: string = '') {
+
   switch (type) {
     case 'detail':
       uni.navigateTo({
@@ -73,10 +73,10 @@ function goto(type: string,item:any={},subItem:string='') {
       })
       break
     case 'link':
-      let data=item.data.find((item:any)=>{
+      let data = item.data.find((item: any) => {
         return item.includes(subItem)
       }).split('@R@')[0]
-     uni.navigateTo({
+      uni.navigateTo({
         url: `/pages/detail/detail?sourceId=${item.sourceId}&code=${data}`,
       })
       break
@@ -92,7 +92,7 @@ function goto(type: string,item:any={},subItem:string='') {
   <wd-card :title="getValue(visibleItems[0]?.content, visibleItems[0]?.title) || ' '">
     <view class="table_collapse">
       <view v-for="(item, index) in visibleItems" :key="index" class="cloum">
-        <wd-row style="border-bottom:1px solid #e8e5e5;padding: 10rpx;">
+        <wd-row >
           <wd-col :span="6">
             <view class="lable">
               <text>{{ item.title }}:</text>
@@ -107,8 +107,9 @@ function goto(type: string,item:any={},subItem:string='') {
               }}
             </view>
             <view v-else-if="item.buttons.includes('detail')">
-              <view @click="goto('link',item,subItem)" style="color: #4d80f0;" v-for="(subItem, subIndex) in getValue(item.content, item.title)?.split('，')" :key="subIndex"> 
-               <text> {{ subItem}}</text>
+              <view @click="goto('link', item, subItem)" class="link"
+                v-for="(subItem, subIndex) in getValue(item.content, item.title)?.split('，')" :key="subIndex">
+                <text> {{ subItem }}</text>
               </view>
             </view>
             <view v-else class="value">
@@ -117,8 +118,11 @@ function goto(type: string,item:any={},subItem:string='') {
           </wd-col>
         </wd-row>
       </view>
-      <wd-button v-if="showMore" type="icon" :icon="isExpanded ? 'arrow-up' : 'arrow-down'" size="small"
-        custom-class="expand-btn" @click="toggleExpand" />
+      <view class="expand-btn-container">
+        <wd-button v-if="showMore" type="icon" :icon="isExpanded ? 'arrow-up' : 'arrow-down'" size="small"
+         @click="toggleExpand" />
+      </view>
+    
     </view>
     <template #footer>
       <wd-button size="small" class="btn" v-if="props.page.buttons.includes('detail')" @click="goto('detail')">
@@ -147,7 +151,8 @@ function goto(type: string,item:any={},subItem:string='') {
     overflow: hidden;
     max-height: 100px;
     color: #3e3e3e;
-
+    border-bottom: 1px solid #e8e5e5;
+    padding: 15rpx 10rpx;
     .lable {
       // font-weight: 600;
       text-align: left;
@@ -169,7 +174,7 @@ function goto(type: string,item:any={},subItem:string='') {
   position: relative; // 添加定位上下文
   padding-bottom: 80rpx; // 为按钮预留空间
 
-  .expand-btn {
+  .expand-btn-container{
     /* 尺寸调整 */
     padding: 8rpx 20rpx;
     font-size: 24rpx;
@@ -189,6 +194,9 @@ function goto(type: string,item:any={},subItem:string='') {
     // border-radius: 16rpx;
     // box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
   }
+  .link{
+    color: #4d80f0;
+  }
 
 }
 

package/w-detail/w-detail.vue

@@ -65,7 +65,7 @@ function goto(PItem: any,item:any) {
     </view>
     <wd-collapse v-model="value" v-else>
       <wd-collapse-item :title="item.title" :name="item.id" v-for="(item, index) in pageConf.groups" :key="index">
-        <wd-card style="box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 17px 0px;margin: 0;" title=" " v-if="item.type === 'fieldGroup'">
+        <wd-card class="card" title=" " v-if="item.type === 'fieldGroup'">
           <view v-for="(subItem, subIndex) in item.fields" :key='subIndex' style='margin-bottom: 15px;'>
             <wd-row  v-if="!subItem.hidden">
             <wd-col :span="6">
@@ -89,7 +89,7 @@ function goto(PItem: any,item:any) {
           </template>
         </wd-card>
         <view v-if="item.type === 'relation'">
-          <wd-card style="box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 17px 0px;margin: 0 0 10px 0;" title=" " v-for="(PItem, PIndex) in pageData.arrayMap[item.id]" :key="PIndex">
+          <wd-card class="card" title=" " v-for="(PItem, PIndex) in pageData.arrayMap[item.id]" :key="PIndex">
             <view v-for="(subItem, subIndex) in item.fields" :key='subIndex' style='margin-bottom: 15px;'>
               <wd-row v-if="!subItem.hidden">
               <wd-col :span="6">
@@ -134,4 +134,8 @@ function goto(PItem: any,item:any) {
   word-break: break-all;
   color: #333;
 }
+.card{
+  box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 17px 0px;
+  margin: 0 0 10px 0;
+}
 </style>

package/w-menu/w-menu.vue

@@ -108,6 +108,7 @@ function queryList() {
   menu().then(res => {
     // 将请求结果通过complete传给z-paging处理，同时也代表请求结束，这一行必须调用
     paging.value.complete(res.data?.blocks||[]);
+    uni.setNavigationBarTitle({ title: res.data?.programName||''})
   }).catch(res => {
     // 如果请求失败写this.$refs.paging.complete(false)，会自动展示错误页面
     // 注意，每次都需要在catch中写这句话很麻烦，z-paging提供了方案可以全局统一处理

package/w-search/w-search.vue

@@ -38,7 +38,7 @@
 
             </view>
             <view class="search-btn">
-              <wd-button style="margin-right: 20rpx;" size="small" icon="search" @click="search">确定</wd-button>
+              <wd-button  size="small" icon="search" @click="search">确定</wd-button>
               <wd-button size="small" icon="refresh" @click="clear">清空</wd-button>
             </view>
 
@@ -174,6 +174,7 @@ async function getEnumer() {
     margin: 20rpx;
     display: flex;
     justify-content: center;
+    gap: 20rpx;
 
   }
 }