w-ui-v1 1.0.24 → 1.0.26

package/index.ts

@@ -9,6 +9,9 @@ import wDetail from './w-detail/w-detail.vue'
 import wAdd from './w-add/w-add.vue'
 import WSearch from './w-search/w-search.vue'
 import WUser from './w-user/w-user.vue'
+import wEdit from './w-edit/w-edit.vue'
+import wSelectTable from './w-table/w-selectTable.vue'
+import WFormMessageBox from './w-form-message-box/w-form-message-box.vue'
 const coms: any[] = [
   wTest,
   wLogin,
@@ -19,7 +22,10 @@ const coms: any[] = [
   wDetail,
   wAdd,
   WSearch,
-  WUser
+  WUser,
+  wEdit,
+  wSelectTable,
+  WFormMessageBox
 ]
 // 批量组件注册
 function install(Vue: App) {

package/package.json

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

package/utils/apis/pageConfig.ts

@@ -45,6 +45,13 @@ export function detailPageData(sourceId: string,code: string) {
   })
 }
 
+//编辑页面详细配置
+export function editPageConfig(sourceId: string,code: string) {
+  return request({
+    url: `/v3/dtmpl/config?sourceId=${sourceId}&code=${code}`,
+  })
+}
+
 
 // 获取页面数据key
 export function getPageKey(sourceId: string, query: string='') {
@@ -75,3 +82,24 @@ export function getEnum(mstrucIds:string) {
     data: mstrucIds
   })
 }
+
+//删除
+export function deletePageData(sourceId: string,code: string) {
+  return request({
+    url: `/v3/ltmpl/data?sourceId=${sourceId}&codes=${code}`,
+    method: 'DELETE',
+  })
+}
+
+//自定义按钮提交
+export function customButtonSave(sourceId: string,codes:string, data: any) {
+  return request({
+    url: `/v3/action`,
+    method: 'POST',
+    data:{
+      sourceId,
+      codes,
+      ...data
+    }
+  })
+}

package/utils/http.ts

@@ -24,7 +24,6 @@ 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==='权限不足或没有资源'){

package/w-add/w-add.vue

@@ -3,48 +3,14 @@
         <view v-if="loading" style="height: 100px;display: flex;justify-content: center;align-items: center;">
             <wd-loading />
         </view>
-        <wd-collapse v-model="value" v-else>
+        <view v-else>
+        <wd-collapse v-model="value" >
             <wd-collapse-item :title="item.title" :name="item.id" v-for="(item, index) in pageConf.groups" :key="index">
                 <view
                     v-if="item.type === 'fieldGroup'">
                     <wd-form ref="form" :model="model">
                         <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"
-                                    :label="subItem.title" label-width="100px" :prop="subItem.id" clearable
-                                    v-model="model[subItem.id]"
-                                    :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
-                                    :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" />
-                                <wd-picker v-if="subItem.extControlType === 'select'" :disabled="subItem.disabled"
-                                    :label="subItem.title" label-width="100px" :prop="subItem.id" clearable
-                                    v-model="model[subItem.id]"
-                                    :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
-                                    :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]"
-                                    :columns="Enumcolumn[subItem.mstrucId]" />
-                                <wd-textarea auto-height v-if="subItem.extControlType === 'textarea'"
-                                    :disabled="subItem.disabled" :label="subItem.title" label-width="100px"
-                                    :prop="subItem.id" clearable v-model="model[subItem.id]"
-                                    :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
-                                    :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" />
-                                <wd-input
-                                    v-if="subItem.extControlType === 'decimal' || subItem.extControlType === 'int'"
-                                    :disabled="subItem.disabled" :label="subItem.title" label-width="100px"
-                                    :prop="subItem.id" clearable v-model="model[subItem.id]" type="number"
-                                    :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
-                                    :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" />
-                                <wd-calendar v-if="subItem.extControlType === 'datetime'" :disabled="subItem.disabled"
-                                    :label="subItem.title" label-width="100px" :prop="subItem.id" clearable
-                                    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>
-
+                              <wFromControl :subItem="subItem" :model="model" :Enumcolumn="Enumcolumn" v-model:model-value="model[subItem.id]"/>
                         </wd-cell-group>
 
                     </wd-form>
@@ -68,42 +34,7 @@
                             </template>
                             <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"
-                                            :label="subItem.title" label-width="100px" :prop="subItem.id" clearable
-                                            v-model="PItem[subItem.id]"
-                                            :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
-                                            :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" />
-                                        <wd-picker v-if="subItem.extControlType === 'select'"
-                                            :disabled="subItem.disabled" :label="subItem.title" label-width="100px"
-                                            :prop="subItem.id" clearable v-model="PItem[subItem.id]"
-                                            :placeholder="subItem.disabled ? '无需输入' : `请选择${subItem.title}`"
-                                            :rules="[{ required: subItem.required, message: `请选择${subItem.title}` }]"
-                                            :columns="Enumcolumn[subItem.mstrucId]" />
-                                        <wd-textarea auto-height v-if="subItem.extControlType === 'textarea'"
-                                            :disabled="subItem.disabled" :label="subItem.title" label-width="100px"
-                                            :prop="subItem.id" clearable v-model="PItem[subItem.id]"
-                                            :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
-                                            :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" />
-                                        <wd-input
-                                            v-if="subItem.extControlType === 'decimal' || subItem.extControlType === 'int'"
-                                            :disabled="subItem.disabled" :label="subItem.title" label-width="100px"
-                                            :prop="subItem.id" clearable v-model="model[subItem.id]" type="number"
-                                            :placeholder="subItem.disabled ? '无需输入' : `请输入${subItem.title}`"
-                                            :rules="[{ required: subItem.required, message: `请填写${subItem.title}` }]" />
-                                        <wd-calendar v-if="subItem.extControlType === 'datetime'"
-                                            :disabled="subItem.disabled" :label="subItem.title" label-width="100px"
-                                            :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>
-
+                                    <wFromControl :subItem="subItem" :model="PItem" :Enumcolumn="Enumcolumn" v-model:model-value="PItem[subItem.id]"/>
                                 </wd-cell-group>
 
                             </wd-form>
@@ -125,23 +56,14 @@
         <view class="footer-button">
             <wd-button block @click="handleSubmit" icon="save">保存</wd-button>
         </view>
+    </view>
         <wd-message-box />
-        <wd-popup safe-area-inset-bottom position="right" v-model="showSelectRow" custom-style="width: 100vw;">
-            <WSelectTable :sourceId="pointSourceId">
-                <template #close>
-                    <view style="display: flex;justify-content: flex-end;">
-                        <wd-button type="icon" icon="close" @click="showSelectRow = false"></wd-button>
-                    </view>
-
-                </template>
-            </WSelectTable>
-        </wd-popup>
         <wd-toast />
     </view>
 </template>
 
 <script setup lang="ts">
-import wSelectPicker from '../w-select-picker/w-select-picker.vue'
+import wFromControl from '../w-form-control/w-form-control.vue'
 import WSelectTable from '../w-table/w-selectTable.vue';
 import { onLoad } from '@dcloudio/uni-app'
 import { ref, defineProps, reactive } from 'vue';
@@ -151,7 +73,6 @@ import {
     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()
@@ -170,10 +91,12 @@ const pageConf = ref({ groups: [] })
 const form = ref()//基本数据表单
 //表单数据
 const model = ref({})
+const modelsRef={
+      
+}
 const loading = ref(false)
 const value = ref([])
 const Enumcolumn = ref({})
-const showSelectRow = ref(false)
 const pointSourceId = ref('')
 onLoad((option: any) => {
     sourceId.value = props.sourceId || option.sourceId
@@ -197,6 +120,7 @@ function getPageConfig() {
                 relation[item.id] = t
             }
             if (item.type === 'fieldGroup') {
+
                 item.fields.forEach((subItem: any) => {
                     if (subItem.extControlType === 'datetime') {
                         fieldGroup[subItem.id] = null
@@ -232,20 +156,9 @@ 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() {
-
     form.value[0]
         .validate()
         .then(async ({ valid, errors }) => {
@@ -254,27 +167,9 @@ async function handleSubmit() {
                     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)
+                    const res = await addPageDataSave(sourceId.value, model.value)
                     if (res.data.status==='success'){
                         toast.success("保存成功")
                           uni.navigateBack()
@@ -298,7 +193,9 @@ async function handleSubmit() {
 //选择数据
 function selectrow(item: any) {
     pointSourceId.value = item.pointSourceId
-    showSelectRow.value = true
+    uni.navigateTo({
+        url: `/pages/selectTable/selectTable?sourceId=${pointSourceId.value}`
+    })
 }
 
 //新加一行

package/w-card/utils/utils.ts

@@ -1,107 +1,172 @@
 const hydrocarbonProgramToken = uni.getStorageSync('hydrocarbonProgramToken') || ''
 const token = uni.getStorageSync('token') || ''
- const baseUrl = uni.getStorageSync('baseUrl') || '/'
+const baseUrl = uni.getStorageSync('baseUrl') || '/'
 // 单项数据转换
 export function getValue(content: any, title: any): any {
-    // 判断title 是否为字符串
-    if (typeof title === 'string') {
-      // 判断title 是否有 '时间'字符
-      if (title.includes('时间')) {
-        // 判断是否为数组
-        if (Array.isArray(content)) {
-          const newArr = content.map((item) => {
-            return formatTime(splitString(item))
-          })
-  
-          // 数组转换为字符串
-          return newArr.join('，')
-        }
-        else {
-          return formatTime(content)
-        }
+  // 判断title 是否为字符串
+  if (typeof title === 'string') {
+    // 判断title 是否有 '时间'字符
+    if (title.includes('时间')) {
+      // 判断是否为数组
+      if (Array.isArray(content)) {
+        const newArr = content.map((item) => {
+          return formatTime(splitString(item))
+        })
+
+        // 数组转换为字符串
+        return newArr.join('，')
       }
-    }
-  
-    // 判断是否为数组
-    if (Array.isArray(content)) {
-      const newArr = content.map((item) => {
-        return splitString(item)
-      })
-  
-      // 数组转换为字符串
-      return newArr.join('，')
-    }
-  
-    // 判断是否为JSON字符串
-    if (typeof content === 'string' && content.startsWith('{') && content.endsWith('}')) {
-      // 解析JSON字符串
-      const obj = JSON.parse(content)
-      
-      // 图片链接
-      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}`,
-          type: '图片',
-        }
+      else {
+        return formatTime(content)
       }
-	  
-	  //文件链接
-	  if (obj.base?.path && (obj.base?.type.includes('docx') )) {
-	    
-	    return {
-	      url: `${baseUrl}/v3/files${obj.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}`,
-		  name:obj.base.fileName,
-	      type: '文件',
-	    }
-	  }
-	  
-	  
     }
-  
-    // 根据content中 "@R@" 分割字符串，取最后一项
-    return splitString(content)
   }
 
-  // 根据 "@R@" 分割字符串，取最后一项
-function splitString(str: string) {
-    // 判断是否为字符串类型
-    if (typeof str !== 'string') {
-      // 如果不是字符串类型，直接返回
-      return str
+  // 判断是否为数组
+  if (Array.isArray(content)) {
+    const newArr = content.map((item) => {
+      return splitString(item)
+    })
+
+    // 数组转换为字符串
+    return newArr.join('，')
+  }
+
+  // 判断是否为JSON字符串
+  if (typeof content === 'string' && content.startsWith('{') && content.endsWith('}')) {
+    // 解析JSON字符串
+    const obj = JSON.parse(content)
+
+    // 图片链接
+    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}`,
+        type: '图片',
+      }
     }
-  
-    if (str) {
-      // 判断是否有 "@R@"
-      if (str.includes('@R@')) {
-        // 分割字符串
-        const splitStr = str.split('@R@')
-        // 返回分割后的数组的最后一项
-        return splitStr[splitStr.length - 1]
+
+    //文件链接
+    if (obj.base?.path && (obj.base?.type.includes('docx')|| obj.base?.type.includes('txt'))) {
+
+      return {
+        url: `${baseUrl}/v3/files${obj.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}`,
+        name: obj.base.fileName,
+        type: '文件',
       }
-      else {
-        // 返回原字符串
-        return str
+    }
+    //判断音频链接
+    if (obj.base?.path && (obj.base?.type.includes('wav'))) {
+
+      return {
+        url: `${baseUrl}/v3/files${obj.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}`,
+        name: obj.base.fileName,
+        type: '音频',
+        author:uni.getStorageSync('userInfo').name
       }
     }
-    // 返回原字符串
+
+
+  }
+
+  // 根据content中 "@R@" 分割字符串，取最后一项
+  return splitString(content)
+}
+
+// 根据 "@R@" 分割字符串，取最后一项
+function splitString(str: string) {
+  // 判断是否为字符串类型
+  if (typeof str !== 'string') {
+    // 如果不是字符串类型，直接返回
     return str
   }
-  
-  // 判断字符串中是否存在'y'字符
- export function hasY(str: string) {
-    // 判断是否为字符串
-    if (typeof str === 'string') {
-      return str.includes('y')
+
+  if (str) {
+    // 判断是否有 "@R@"
+    if (str.includes('@R@')) {
+      // 分割字符串
+      const splitStr = str.split('@R@')
+      // 返回分割后的数组的最后一项
+      return splitStr[splitStr.length - 1]
     }
-    return false
-  }
-  
-  // 格式化时间
-  function formatTime(str: string) {
-    if (typeof str === 'string') {
-      // 去掉小数点
-      return str.split('.')[0]
+    else {
+      // 返回原字符串
+      return str
     }
-    return str
-  }
+  }
+  // 返回原字符串
+  return str
+}
+
+// 判断字符串中是否存在'y'字符
+export function hasY(str: string) {
+  // 判断是否为字符串
+  if (typeof str === 'string') {
+    return str.includes('y')
+  }
+  return false
+}
+
+// 格式化时间
+function formatTime(str: string) {
+  if (typeof str === 'string') {
+    // 去掉小数点
+    return str.split('.')[0]
+  }
+  return str
+}
+
+//下载文件
+export const downloadFile = (url: any) => {
+	uni.downloadFile({
+		url: url, // 文件的网络地址
+		success: (res) => {
+			if (res.statusCode === 200) {
+				console.log('下载成功', res.tempFilePath);
+				// 打开文件（如PDF、Word等）
+				uni.openDocument({
+					filePath: res.tempFilePath,
+					showMenu: true,
+					success: () => console.log('打开文件成功')
+				});
+				// // 将临时文件保存到本地
+				// uni.saveFile({
+				// 	tempFilePath: res.tempFilePath,
+				// 	success: (saveRes) => {
+				// 		console.log('文件保存成功', saveRes.savedFilePath);
+				// 		const savedFilePath = saveRes.savedFilePath; // 保存后的路径
+				// 		// 打开文件（如PDF、Word等）
+				// 		uni.openDocument({
+				// 			filePath: savedFilePath,
+				// 			success: () => console.log('打开文件成功')
+				// 		});
+				// 		uni.showToast({
+				// 			title: '文件保存成功',
+				// 			icon: 'success'
+				// 		});
+				// 	},
+				// 	fail: (saveErr) => {
+				// 		console.error('文件保存失败', saveErr);
+				// 		uni.showToast({
+				// 			title: '文件保存失败',
+				// 			icon: 'none'
+				// 		});
+				// 	}
+				// });
+			} else {
+				console.error('下载失败', res);
+				uni.showToast({
+					title: '下载失败',
+					icon: 'none'
+				});
+			}
+		},
+		fail: (err) => {
+			console.error('下载失败', err);
+			uni.showToast({
+				title: '下载失败',
+				icon: 'none'
+			});
+		}
+	});
+}