w-ui-v1 1.0.20 → 1.0.22

package/package.json

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

package/utils/apis/login.ts

@@ -40,3 +40,12 @@ export function getKaptchaToken() {
     method: 'POST',
   })
 }
+
+//获取登录用户权限配置信息
+export function getUserConfig() {
+  return request({
+    url: `/v3/current-user`,
+  })
+}
+
+

package/utils/apis/pageConfig.ts

@@ -19,6 +19,18 @@ export function addPageConfig(sourceId: string) {
   })
 }
 
+//新增页面提交保存
+export function addPageDataSave(sourceId: string, data: any) {
+  return request({
+    url: `/v3/dtmpl/data`,
+    method: 'POST',
+    data:{
+      sourceId,
+      ...data
+    }
+  })
+}
+
 //详情页面详细配置
 export function detailPageConfig(sourceId: string) {
   return request({

package/w-add/w-add.vue

@@ -5,7 +5,7 @@
         </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=" "
+                <view
                     v-if="item.type === 'fieldGroup'">
                     <wd-form ref="form" :model="model">
                         <wd-cell-group v-for="(subItem, subIndex) in item.fields" :key="subIndex">
@@ -37,15 +37,19 @@
                                     v-model="model[subItem.id]" type="datetime"
                                     :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
                                     :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" />
+                                <wSelectPicker @confirm="wSelectPickerconfirm" :prop="subItem.id"
+                                    v-if="subItem.extControlType === 'relselect'" v-model="model[subItem.id]"
+                                    :disabled="subItem.disabled" :label="subItem.title" type="radio"
+                                    :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
+                                    :source-id="subItem.sourceId" clearable filterable
+                                    :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" />
                             </view>
 
                         </wd-cell-group>
 
                     </wd-form>
-                    <template #footer>
-
-                    </template>
-                </wd-card>
+                   
+                </view>
                 <view v-if="item.type === 'relation'">
                     <view v-if="item.pointSourceId">
                         <view class="row-add" v-if="item.buttons.includes('selectAdd')">
@@ -62,7 +66,7 @@
                                         @click="remove(item.id, PIndex, item.title)"></wd-button>
                                 </view>
                             </template>
-                            <wd-form ref="form" :model="PItem">
+                            <wd-form :ref="item.id" :model="PItem">
                                 <wd-cell-group v-for="(subItem, subIndex) in item.fields" :key="subIndex">
                                     <view v-if="!subItem.hidden" style="border-bottom: 1px solid rgb(243 242 242);">
                                         <wd-input v-if="subItem.extControlType === 'text'" :disabled="subItem.disabled"
@@ -92,6 +96,12 @@
                                             :prop="subItem.id" clearable v-model="model[subItem.id]" type="number"
                                             :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
                                             :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" />
+                                        <wSelectPicker :prop="subItem.id" v-if="subItem.extControlType === 'relselect'"
+                                            v-model="model[subItem.id]" :disabled="subItem.disabled"
+                                            :label="subItem.title" type="radio"
+                                            :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
+                                            :source-id="subItem.sourceId" clearable filterable
+                                            :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]" />
                                     </view>
 
                                 </wd-cell-group>
@@ -117,27 +127,33 @@
         </view>
         <wd-message-box />
         <wd-popup safe-area-inset-bottom position="right" v-model="showSelectRow" custom-style="width: 100vw;">
-           <WSelectTable :sourceId="pointSourceId" >
+            <WSelectTable :sourceId="pointSourceId">
                 <template #close>
                     <view style="display: flex;justify-content: flex-end;">
-                        <wd-button type="icon" icon="close" @click="showSelectRow=false"></wd-button>
+                        <wd-button type="icon" icon="close" @click="showSelectRow = false"></wd-button>
                     </view>
-                    
+
                 </template>
-           </WSelectTable>
+            </WSelectTable>
         </wd-popup>
+        <wd-toast />
     </view>
 </template>
 
 <script setup lang="ts">
+import wSelectPicker from '../w-select-picker/w-select-picker.vue'
 import WSelectTable from '../w-table/w-selectTable.vue';
 import { onLoad } from '@dcloudio/uni-app'
 import { ref, defineProps, reactive } from 'vue';
 import {
     addPageConfig,
-    getEnum
+    getEnum,
+    addPageDataSave
 } from '../utils/apis/pageConfig'
 import { useMessage } from 'wot-design-uni'
+import dayjs from 'dayjs/esm/index'
+import { useToast } from 'wot-design-uni'
+const toast = useToast()
 const message = useMessage()
 defineOptions({
     name: 'w-add'
@@ -151,15 +167,16 @@ const props = defineProps({
 })
 const sourceId = ref('')
 const pageConf = ref({ groups: [] })
+const form = ref()//基本数据表单
 //表单数据
 const model = ref({})
 const loading = ref(false)
 const value = ref([])
 const Enumcolumn = ref({})
 const showSelectRow = ref(false)
-const pointSourceId= ref('')
+const pointSourceId = ref('')
 onLoad((option: any) => {
-    sourceId.value = props.sourceId  || option.sourceId
+    sourceId.value = props.sourceId || option.sourceId
     getPageConfig()
 })
 
@@ -215,14 +232,72 @@ async function getEnumer() {
     Enumcolumn.value = res.data?.enumMap || {}
 }
 
+//wSelectPicker组件确定事件
+const wSelectPickerconfirmData = ref([])//暂存wSelectPicker组件选中的数据
+const wSelectPickerconfirm = (e) => {
+    console.log(e)
+    if (Array.isArray(e.selectedItems)) {
+        wSelectPickerconfirmData.value.push(...e.selectedItems)
+    } else {
+        wSelectPickerconfirmData.value.push(e.selectedItems)
+    }
+}
+
 //保存
 async function handleSubmit() {
-    console.log(model.value)
+
+    form.value[0]
+        .validate()
+        .then(async ({ valid, errors }) => {
+            if (valid) {
+                toast.loading({
+                    message: '保存中...',
+                    duration: 0
+                })
+                const newModel = {}
+                pageConf.value.groups?.forEach((item: any) => {
+                    item.fields?.forEach((subItem: any) => {
+                        switch (subItem.extControlType) {
+                            case 'relselect':
+                                let t = wSelectPickerconfirmData.value.find((sItem: any) => {
+                                    return sItem.value === model.value[subItem.id]
+                                })
+                                newModel[subItem.id] = `${t.value}@R@${t.label}`
+                                break
+                            case 'datetime':
+                                newModel[subItem.id] = model.value[subItem.id] ? dayjs(model.value[subItem.id]).format('YYYY-MM-DD HH:mm:ss') : ''
+                                break
+                            default:
+                                newModel[subItem.id] = model.value[subItem.id]
+                        }
+                    })
+                });
+                console.log(newModel)
+                try {
+                    const res = await addPageDataSave(sourceId.value, newModel)
+                    if (res.data.status==='success'){
+                        toast.success("保存成功")
+                          uni.navigateBack()
+                    }else{
+                        toast.error(res.data.message||'保存失败"')
+                    }
+                        
+                } catch (error) {
+                    toast.error(error)
+                }
+
+              
+            }
+        })
+        .catch((error) => {
+            console.log(error, 'error')
+        })
+
 }
 
 //选择数据
 function selectrow(item: any) {
-    pointSourceId.value=item.pointSourceId
+    pointSourceId.value = item.pointSourceId
     showSelectRow.value = true
 }
 

package/w-card/w-card.vue

@@ -125,15 +125,17 @@ function goto(type: string, item: any = {}, subItem: string = '') {
     
     </view>
     <template #footer>
-      <wd-button size="small" class="btn" v-if="props.page.buttons.includes('detail')" @click="goto('detail')">
+      <view class="btns-box">
+        <wd-button size="small" class="btn" plain v-if="props.page.buttons.includes('detail')" @click="goto('detail')">
         详情
       </wd-button>
-      <wd-button size="small" class="btn" v-if="props.page.buttons.includes('dtmplEdit')">
+      <wd-button size="small" class="btn" plain v-if="props.page.buttons.includes('dtmplEdit')">
         编辑
       </wd-button>
-      <wd-button size="small" class="btn" type="error" v-if="props.page.buttons.includes('singleDelete')">
+      <wd-button size="small" class="btn" plain type="error" v-if="props.page.buttons.includes('singleDelete')">
         删除
       </wd-button>
+    </view>
     </template>
   </wd-card>
 </template>
@@ -203,4 +205,9 @@ function goto(type: string, item: any = {}, subItem: string = '') {
 .btn {
   margin-left: 10rpx;
 }
+.btns-box{
+  display: flex;
+  justify-content: flex-end;
+  gap: 5px;
+}
 </style>

package/w-login/w-login.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { onMounted, reactive, ref } from 'vue'
 import { useToast } from 'wot-design-uni'
-import { login, pubKey } from '../utils/apis/login'
+import { login, pubKey, getUserConfig } from '../utils/apis/login'
 import WSwitchLang from '../w-switch-lang/w-switch-lang.vue'
 
 defineOptions({
@@ -50,9 +50,12 @@ function handleLogin() {
     }
     showSuccess('登录成功')
     uni.setStorageSync('token', data.token)
-    uni.setStorageSync('userInfo', {
-      usernamse:model.username
+    getUserConfig().then(({ data }: any) => {
+      uni.setStorageSync('userInfo', {
+        ...data.user
+      })
     })
+
     uni.reLaunch({
       url: '/pages/index/index',
     })
@@ -74,7 +77,7 @@ function handleSubmit() {
 
 <template>
   <view class="login">
-    <WSwitchLang v-if="props.langSwitch"/>
+    <WSwitchLang v-if="props.langSwitch" />
     <view v-if="props.loginImge" class="avatar">
       <wd-img width="200rpx" height="200rpx" :src="props.loginImge">
         <template #error>
@@ -87,14 +90,10 @@ function handleSubmit() {
 
     <wd-form ref="form" :model="model">
       <wd-cell-group>
-        <wd-input
-          v-model="model.username" label="用户名" label-width="100px" prop="username" clearable
-          placeholder="请输入用户名" :rules="[{ required: true, message: '请填写用户名' }]"
-        />
-        <wd-input
-          v-model="model.password" label="密码" label-width="100px" prop="password" show-password
-          clearable placeholder="请输入密码" :rules="[{ required: true, message: '请填写密码' }]"
-        />
+        <wd-input v-model="model.username" label="用户名" label-width="100px" prop="username" clearable
+          placeholder="请输入用户名" :rules="[{ required: true, message: '请填写用户名' }]" />
+        <wd-input v-model="model.password" label="密码" label-width="100px" prop="password" show-password clearable
+          placeholder="请输入密码" :rules="[{ required: true, message: '请填写密码' }]" />
       </wd-cell-group>
       <view class="footer">
         <wd-button type="primary" block @click="handleSubmit">
@@ -108,18 +107,20 @@ function handleSubmit() {
 
 <style scoped lang="scss">
 .login {
-background-color: #fff;
-    .lang{
-          display: flex;
-          justify-content: flex-end;
-    }
-    .avatar {
-        display: flex;
-        justify-content: center;
-    }
+  background-color: #fff;
 
-    .footer {
-        padding: 12px;
-    }
+  .lang {
+    display: flex;
+    justify-content: flex-end;
+  }
+
+  .avatar {
+    display: flex;
+    justify-content: center;
+  }
+
+  .footer {
+    padding: 12px;
+  }
 }
 </style>

package/w-menu/w-menu.vue

@@ -120,10 +120,10 @@ function queryList() {
 
 <template>
   <z-paging ref="paging" v-model="menuList" @query="queryList">
+	  <template #top>
+	      
+	  </template>
     <view>
-      <view class="img_box">
-        <!-- <wd-img height="250rpx" width="100%" src="../../static/bar.png" /> -->
-      </view>
       <view v-if="filtermenu.length > 0">
         <wd-card v-for="(item, index) in filtermenu" :key="index" :title="item.title">
           <template #default>
@@ -147,6 +147,9 @@ function queryList() {
       <wd-action-sheet v-model="sheetShow" :actions="actions" :title="title"
         @select="({ item }) => { sheetGotoPage(item) }" />
     </view>
+	<template #bottom>
+	  
+	  </template>
   </z-paging>
 </template>
 

package/w-select-picker/w-select-picker.vue

@@ -91,7 +91,7 @@ import {
   getPageKey,
   pageConfig
 } from '../utils/apis/pageConfig'
-import { getCurrentInstance, onBeforeMount, ref, watch, nextTick, computed } from 'vue'
+import { getCurrentInstance, onBeforeMount, ref, watch, nextTick, computed,defineEmits } from 'vue'
 import { useCell } from 'wot-design-uni/components/composables/useCell'
 import { getRect, isArray, isDef, isFunction, pause } from 'wot-design-uni/components/common/util'
 import { useParent } from 'wot-design-uni/components/composables/useParent'
@@ -282,8 +282,9 @@ async function setScrollIntoView() {
 function noop() { }
 
 function getSelectedItem(value: string | number | boolean) {
-  const { valueKey, labelKey, columns } = props
 
+  const { valueKey, labelKey, columns } = props
+   
   const selecteds = columns.filter((item) => {
     return item[valueKey] === value
   })
@@ -426,9 +427,10 @@ const showArrow = computed(() => {
 
 //根据配置获取数据
 const getlist = (data: any[] = []) => {
+  console.log('getlist',ltmplConfig.value)
  let formatData= data.map((item) => {
     return {
-      value: item.fieldMap[ltmplConfig.value.primaryColumn.sourceId],
+      value: item.code,
       label: item.fieldMap[ltmplConfig.value.primaryColumn.sourceId]
     }
   })||[]

package/w-user/w-user.vue

@@ -1,16 +1,24 @@
 <template>
     <view class="user">
-        <view class="top">
+        <view class="top-box">
+            <view class="top">
             <view class="circle">
                 <wd-icon name="user-circle" size="120rpx" color="#bababa"></wd-icon>
             </view>
             <view class="username">
                 <view class="name">
-                    <text>{{ userInfo['用户名'] }}</text>
+                    <text>{{ userInfo.name }}</text>
+                </view>
+                <view class="nickName">
+                    <text>昵称：{{ userInfo.nickName }}</text>
                 </view>
             </view>
         </view>
+        </view>
+        
         <wd-cell-group>
+            <wd-cell title="个人信息" icon="user" v-if="userInfo.viewPersonalInfoable" :is-link="true" :clickable="true"  @click="goUserInfo"/>
+            <!-- <wd-cell title="修改密码" icon="keywords" :is-link="true" :clickable="true"  /> -->
             <wd-cell title="退出登录" icon="logout" :is-link="true" :clickable="true" @click="quit" />
         </wd-cell-group>
         <wd-message-box />
@@ -27,8 +35,12 @@ defineOptions({
 })
 const message = useMessage()
 const userInfo = ref({
-    '用户名':uni.getStorageSync('userInfo').username || 'adminkk',
+    name:uni.getStorageSync('userInfo').name,
+    nickName:uni.getStorageSync('userInfo').nickName,
+    viewPersonalInfoable:uni.getStorageSync('userInfo').viewPersonalInfoable
 })
+
+//退出登录
 const quit = () => {
     message
         .confirm({
@@ -46,6 +58,13 @@ const quit = () => {
         })
 
 }
+
+//查看用户信息
+const goUserInfo = () => {
+    uni.navigateTo({
+        url: `/pages/detail/detail?sourceId=${uni.getStorageSync('userInfo').gtmplSourceId}&code=${uni.getStorageSync('userInfo').id}`
+    })
+}
 </script>
 
 <style scoped lang="scss">
@@ -53,14 +72,18 @@ const quit = () => {
     background-color: #f5f5f5;
     height: 100vh;
 
-    .top {
+    .top-box{
+        // display: flex;
+        // justify-content: center;
+        // padding: 10px;
+        .top {
         display: flex;
         align-items: center;
         padding: 25rpx;
-        background-color: #fff;
+        background-color: #4d80f0;
 
         .circle {
-            background-color: #efefef;
+            background-color: #fcfcfccd;
             border-radius: 100%;
             margin-right: 20rpx;
         }
@@ -70,13 +93,20 @@ const quit = () => {
 
             .name {
                 margin-bottom: 10rpx;
+                color: #fff;
             }
 
             .ic {
                 font-size: 30rpx;
-                color: #ccc;
+                color: #fff;
+            }
+            .nickName{
+                font-size: 12px;
+                color: #fff;
             }
         }
     }
+    }
+   
 }
 </style>