w-ui-v1 1.0.8 → 1.0.10

package/index.ts

@@ -4,17 +4,20 @@ import WMenu from './w-menu/w-menu.vue'
 import wSwitchLang from './w-switch-lang/w-switch-lang.vue'
 import WTable from './w-table/w-table.vue'
 import wTest from './w-test/w-test.vue'
-
-interface NamedComponent {
-  name: string
-  new (): any
-}
-const coms: NamedComponent[] = [
+import wSelectPicker from './w-select-picker/w-select-picker.vue'
+import wDetail from './w-detail/w-detail.vue'
+import wAdd from './w-add/w-add.vue'
+import WSearch from './w-search/w-search.vue'
+const coms: any[] = [
   wTest,
   wLogin,
   wSwitchLang,
   WMenu,
   WTable,
+  wSelectPicker,
+  wDetail,
+  wAdd,
+  WSearch
 ]
 // 批量组件注册
 function install(Vue: App) {

package/package.json

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

package/utils/apis/pageConfig.ts

@@ -5,16 +5,37 @@ export function pageConfig(sourceId: string) {
     url: `/v3/ltmpl/config?sourceId=${sourceId}`,
   })
 }
+//勾选列表页面详细配置
+export function selectPageConfig(sourceId: string) {
+  return request({
+    url: `/v3/select/config?sourceId=${sourceId}`,
+  })
+}
 
-// 添加页面详细配置
+// 新增页面详细配置
 export function addPageConfig(sourceId: string) {
   return request({
     url: `/v3/add-dtmpl/config?sourceId=${sourceId}`,
   })
 }
 
+//详情页面详细配置
+export function detailPageConfig(sourceId: string) {
+  return request({
+    url: `/v3/view-dtmpl/config?sourceId=${sourceId}`,
+  })
+}
+
+//详情页面数据
+export function detailPageData(sourceId: string,code: string) {
+  return request({
+    url: `/v3/view-dtmpl/data?sourceId=${sourceId}&code=${code}`,
+  })
+}
+
+
 // 获取页面数据key
-export function getPageKey(sourceId: string, query: string) {
+export function getPageKey(sourceId: string, query: string='') {
   return request({
     url: `/v3/ltmpl/query/key?sourceId=${sourceId}&menuId=${sourceId}&${query}`,
   })
@@ -33,3 +54,12 @@ export function getPageTotal(queryKey: string) {
     url: `/v3/ltmpl/query/count?queryKey=${queryKey}`,
   })
 }
+
+//获取枚举
+export function getEnum(mstrucIds:string) {
+  return request({
+    url: `/v3/enum`,
+    method: 'POST',
+    data: mstrucIds
+  })
+}

package/utils/http.ts

@@ -1,6 +1,6 @@
 // 用promise 封装uni.request
 export default function request(options: any): Promise<any> {
-  const baseUrl = uni.getStorageSync('baseUrl') || 'http://1.94.178.181:8082'
+  const baseUrl = uni.getStorageSync('baseUrl')||'/'
   const hydrocarbonProgramToken = uni.getStorageSync('hydrocarbonProgramToken') || ''
   const token = uni.getStorageSync('token') || ''
   const header = options.header || {}

package/w-add/w-add.vue

@@ -0,0 +1,275 @@
+<template>
+    <view>
+        <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>
+            <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-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}` }]" />
+                            </view>
+
+                        </wd-cell-group>
+
+                    </wd-form>
+                    <template #footer>
+
+                    </template>
+                </wd-card>
+                <view v-if="item.type === 'relation'">
+                    <view v-if="item.pointSourceId">
+                        <view class="row-add" v-if="item.buttons.includes('selectAdd')">
+                            <wd-button hairline type="info" size="small" icon="add"
+                                @click="selectrow(item)">选择</wd-button>
+                        </view>
+                    </view>
+                    <view v-else>
+                        <wd-card style="box-shadow: rgba(0, 0, 0, 0.1) 0px 4px 17px 0px;margin: 0 0 10px 0;"
+                            v-for="(PItem, PIndex) in model[item.id]">
+                            <template #title>
+                                <view style="display: flex;justify-content: flex-end;">
+                                    <wd-button size="small" type="icon" icon="delete"
+                                        @click="remove(item.id, PIndex, item.title)"></wd-button>
+                                </view>
+                            </template>
+                            <wd-form ref="form" :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}` }]" />
+                                    </view>
+
+                                </wd-cell-group>
+
+                            </wd-form>
+                            <template #footer>
+
+                            </template>
+                        </wd-card>
+                        <view class="row-add" v-if="item.buttons.includes('rowAdd')">
+                            <wd-button hairline type="info" size="small" icon="add"
+                                @click="addrow(item.id)">加一条</wd-button>
+                        </view>
+                    </view>
+
+                </view>
+
+
+            </wd-collapse-item>
+        </wd-collapse>
+        <view class="footer-button">
+            <wd-button block @click="handleSubmit" icon="save">保存</wd-button>
+        </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>
+    </view>
+</template>
+
+<script setup lang="ts">
+import WSelectTable from '../w-table/w-selectTable.vue';
+import { onLoad } from '@dcloudio/uni-app'
+import { ref, defineProps, reactive } from 'vue';
+import {
+    addPageConfig,
+    getEnum
+} from '../utils/apis/pageConfig'
+import { useMessage } from 'wot-design-uni'
+const message = useMessage()
+defineOptions({
+    name: 'w-add'
+})
+const props = defineProps({
+    sourceId: {
+        type: String,
+        default: ''
+    },
+
+})
+const sourceId = ref('')
+const pageConf = ref({ groups: [] })
+//表单数据
+const model = ref({})
+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
+    getPageConfig()
+})
+
+function getPageConfig() {
+    loading.value = true
+    addPageConfig(sourceId.value).then((res: any) => {
+        pageConf.value = res.data.dtmplConfig
+
+        let fieldGroup = {}
+        let relation = {}
+        res.data.dtmplConfig.groups.forEach((item: any) => {
+            value.value.push(item.id)
+            if (item.type === 'relation') {
+                let t = []
+                // item.fields.forEach((subItem: any) => {
+                //     t[0][subItem.id] = subItem.defaultValue || ''
+                // })
+                relation[item.id] = t
+            }
+            if (item.type === 'fieldGroup') {
+                item.fields.forEach((subItem: any) => {
+                    if (subItem.extControlType === 'datetime') {
+                        fieldGroup[subItem.id] = null
+                        return
+                    }
+                    fieldGroup[subItem.id] = subItem.defaultValue || ''
+
+                })
+            }
+
+        })
+        model.value = {
+            ...relation,
+            ...fieldGroup//一般为基本信息
+        }
+        getEnumer()
+        loading.value = false
+    })
+
+}
+//获取枚举
+async function getEnumer() {
+    let params = []
+    pageConf.value.groups?.forEach((item: any) => {
+        item.fields?.forEach((subItem: any) => {
+            if (subItem.extControlType === 'select') {
+                params.push(`mstrucIds=${subItem.mstrucId}`)
+            }
+        })
+    });
+    if (!params.length) return
+    const res = await getEnum(params.join("&"))
+    Enumcolumn.value = res.data?.enumMap || {}
+}
+
+//保存
+async function handleSubmit() {
+    console.log(model.value)
+}
+
+//选择数据
+function selectrow(item: any) {
+    pointSourceId.value=item.pointSourceId
+    showSelectRow.value = true
+}
+
+//新加一行
+function addrow(key: any) {
+
+    let data = pageConf.value.groups.find((item: any) => {
+        return item.id === key
+    })
+    let t = {}
+    data.fields.forEach((subItem: any) => {
+        t[subItem.id] = subItem.defaultValue || ''
+    })
+    model.value[key].push(t)
+}
+//删除一行
+function remove(key: any, index: any, title: string) {
+    message
+        .confirm({
+            msg: `${title}--确定删除第${index + 1}条数据吗？`,
+            title: '删除'
+        })
+        .then(() => {
+            model.value[key].splice(index, 1)
+        })
+        .catch(() => {
+            console.log('点击了取消按钮')
+        })
+
+}
+</script>
+
+<style scoped lang="scss">
+.footer-button {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 5px 10px 5px 10px;
+    position: sticky;
+    bottom: 0;
+    background-color: #fff;
+
+}
+
+.row-add {
+    // background-color: #fff;
+    // margin: 0 0 8px 0;
+    display: flex;
+    justify-content: center;
+}
+</style>

package/w-card/utils/utils.ts

@@ -0,0 +1,95 @@
+const hydrocarbonProgramToken = uni.getStorageSync('hydrocarbonProgramToken') || ''
+const token = uni.getStorageSync('token') || ''
+ 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)
+        }
+      }
+    }
+  
+    // 判断是否为数组
+    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'))) {
+  
+        return {
+          url: `${baseUrl}/v3/files${obj.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}`,
+          type: '图片',
+        }
+      }
+    }
+  
+    // 根据content中 "@R@" 分割字符串，取最后一项
+    return splitString(content)
+  }
+
+  // 根据 "@R@" 分割字符串，取最后一项
+function splitString(str: string) {
+    // 判断是否为字符串类型
+    if (typeof str !== 'string') {
+      // 如果不是字符串类型，直接返回
+      return str
+    }
+  
+    if (str) {
+      // 判断是否有 "@R@"
+      if (str.includes('@R@')) {
+        // 分割字符串
+        const splitStr = str.split('@R@')
+        // 返回分割后的数组的最后一项
+        return splitStr[splitStr.length - 1]
+      }
+      else {
+        // 返回原字符串
+        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
+  }

package/w-card/w-card.vue

@@ -0,0 +1,198 @@
+<script setup lang="ts">
+import {
+  computed,
+  defineProps,
+  ref,
+} from 'vue'
+import { hasY,getValue } from './utils/utils'
+
+const props = defineProps({
+  page: {
+    type: Object,
+    required: true,
+  },
+  itemData: {
+    type: Object,
+    required: true,
+  },
+  carIndex: {
+    type: Number,
+    required: true,
+  },
+  sourceId: {
+    type: String,
+    required: true,
+  },
+})
+
+// 处理单项数据、配置
+const items = computed(() => {
+  return props.page.columns?.filter((item: any) => {
+    // 过滤掉操作列
+    return item.title !== '操作'
+  }).filter((item: any) => {
+    // 过滤掉title 中有 'y'字符的列
+    return !hasY(item.title)
+  }).map((item: any) => {
+    return {
+      title: item.title,
+      content: props.itemData?.fieldMap[item.id],
+      data:props.itemData?.fieldMap[item.id],
+      id: item.id,
+      mstrucId: item.mstrucId,
+      sourceId: item.sourceId,
+      buttons:item.buttons
+    }
+  }) || []
+})
+
+
+
+const isExpanded = ref(false)
+const defaultVisible = 4 // 默认显示行数量
+
+const visibleItems = computed(() => {
+  return isExpanded.value ? items.value : items.value.slice(0, defaultVisible)
+})
+
+const showMore = computed(() => {
+  return items.value.length > defaultVisible
+})
+
+function toggleExpand() {
+  isExpanded.value = !isExpanded.value
+}
+
+// 跳转页页面
+function goto(type: string,item:any={},subItem:string='') {
+  
+  switch (type) {
+    case 'detail':
+      uni.navigateTo({
+        url: `/pages/detail/detail?sourceId=${props.sourceId}&code=${props.itemData.code}`,
+      })
+      break
+    case 'link':
+      let data=item.data.find((item:any)=>{
+        return item.includes(subItem)
+      }).split('@R@')[0]
+     uni.navigateTo({
+        url: `/pages/detail/detail?sourceId=${item.sourceId}&code=${data}`,
+      })
+      break
+    case 'singleDelete':
+
+      break
+  }
+
+}
+</script>
+
+<template>
+  <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-col :span="6">
+            <view class="lable">
+              <text>{{ item.title }}:</text>
+            </view>
+          </wd-col>
+          <wd-col :span="18">
+            <wd-img v-if="getValue(item.content, item.title)?.type === '图片'" width="100rpx" height="100rpx"
+              :src="getValue(item.content, item.title).url" :enable-preview="true" />
+            <view v-else-if="item.title === '序号'">
+              {{
+                carIndex + 1
+              }}
+            </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>
+            </view>
+            <view v-else class="value">
+              {{ getValue(item.content, item.title) }}
+            </view>
+          </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>
+    <template #footer>
+      <wd-button size="small" class="btn" 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>
+      <wd-button size="small" class="btn" type="error" v-if="props.page.buttons.includes('singleDelete')">
+        删除
+      </wd-button>
+    </template>
+  </wd-card>
+</template>
+
+<style lang="scss" scoped>
+.table_collapse {
+
+  color: #000;
+  background-color: #F8F8F8;
+  padding: 20rpx;
+
+  /* 添加过渡动画 */
+  .cloum {
+    transition: all 0.3s ease;
+    overflow: hidden;
+    max-height: 100px;
+    color: #3e3e3e;
+
+    .lable {
+      // font-weight: 600;
+      text-align: left;
+      margin-right: 20rpx;
+    }
+
+    .value {
+      color: #000;
+      // text-align: justify;  /* 文字两端对齐 */
+      // word-break: break-all; /* 强制英文/数字换行时断词 */
+      word-break: break-all;
+      /* 所有字符（包括中文）强制换行 */
+      white-space: normal;
+      /* 确保不保留空白符 */
+    }
+
+  }
+
+  position: relative; // 添加定位上下文
+  padding-bottom: 80rpx; // 为按钮预留空间
+
+  .expand-btn {
+    /* 尺寸调整 */
+    padding: 8rpx 20rpx;
+    font-size: 24rpx;
+    line-height: 1.2;
+
+    /* 定位调整 */
+    position: absolute;
+    right: 50%;
+    transform: translateX(50%);
+    bottom: 0;
+    width: auto !important;
+    margin-top: 0;
+
+    /* 视觉样式 */
+    // background: #ffffff;
+    // border: 1px solid #ebedf0;
+    // border-radius: 16rpx;
+    // box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
+  }
+
+}
+
+.btn {
+  margin-left: 10rpx;
+}
+</style>