wui-components-v2 1.0.96 → 1.0.98

package/components/card-botom-buttons/card-botom-buttons.vue

@@ -6,6 +6,7 @@ import type { ClassEditConfigs, Entities, Fields, Groups, rowActions } from '../
 import ActionPopup from '../action-popup/action-popup.vue'
 import { actionDataSave } from '../../api/page'
 import { useGlobalToast } from '../../composables/useGlobalToast'
+import { comparator } from '../../utils/index'
 
 defineOptions({
   name: 'CardBotomButtons',
@@ -27,7 +28,7 @@ onLoad((option: any) => {
 })
 const router = useRouter()
 
-// anction按钮
+// rowActions按钮
 const anctions = computed(() => {
   const rowActions = props.rowActions || []
   return [...rowActions.filter(isShowAction)]
@@ -54,7 +55,7 @@ function edit() {
 
 const actionItem = ref<Groups>()
 const actionItemShow = ref(false)
-// 打开action弹框
+// 打开rowActions弹框
 async function action(subitem: rowActions) {
   console.log(subitem)
   if (subitem.writes.length) {
@@ -88,12 +89,12 @@ function detail() {
   router.push(`/pages/details-page/index?sourceId=${props.sourceId}&id=${props.code}&title=${props.item.title}`)
 }
 
-// 判断action 按钮是否显示
+// 判断按钮是否满足条件显示
 function isShowAction(item: rowActions) {
   if (item.preposes.length > 0) {
     return item.preposes.every((prepose: Fields) => {
-      // 判断字段值是否相等
-      return prepose.transDefaultValue.includes(props.data.fieldMap[prepose.sourceId])
+      // 判断字段值是否满足要求
+      return comparator(prepose.comparator || 'equal', props.data.fieldMap[prepose.sourceId], prepose.defaultValue)
     })
   }
   return true

package/components/label-value/label-value.vue

@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import { computed, defineOptions, defineProps, ref } from 'vue'
 import type { Columns, Entities } from '../../type'
-import { formatItemData } from '../../utils'
+import { downloadFile, formatItemData } from '../../utils'
 import ControlTypeSupportor from '../../utils/control-type-supportor'
 import VideoPlay from '../video-play/video-play.vue'
+import { useManualTheme } from '../../composables/useManualTheme'
 
 defineOptions({
   name: 'LabelValue',
@@ -12,20 +13,11 @@ const props = defineProps<{
   exhibitData: Columns[]
   data: Entities
 }>()
+const { primary } = useManualTheme()
 const clums = computed(() => {
   return props.exhibitData.filter(item => !item.title?.includes('y'))
 })
 const videoPlayRef = ref()
-// function splitUrlStr(str: string) {
-//   if (str) {
-//     const strarr = str.split('&')
-//     return strarr[strarr.length - 1].split('=')[1] || ''
-//   }
-//   else {
-//     return '暂无文件'
-//   }
-// }
-
 function openVideo(uitem: any) {
   videoPlayRef.value.open(uitem.url)
 }
@@ -42,23 +34,19 @@ function isControlType(item: Columns): string {
     </view>
     <view
       v-if="isControlType(item) === 'file' || isControlType(item) === 'relfile'"
-      class="flex-1 text-gray-800 dark:text-white"
+      class="flex flex-1 items-center text-gray-800 dark:text-white"
     >
       <view v-if="data.fieldMap[item.sourceId]">
         <view
           v-for="(uitem, uindex) in formatItemData(data.fieldMap[item.sourceId], isControlType(item))"
           :key="uindex"
         >
+          <!-- 图片 -->
           <wd-img
             v-if="['png', 'jpg', 'jpeg'].includes(uitem.type)" enable-preview :width="100" :height="100"
             :src="uitem.url"
           >
             <template #error>
-              <!-- <view class="error-wrap">
-                <wd-button type="text" @click="downloadFile(url)">
-                  {{ splitUrlStr(url) || '' }}
-                </wd-button>
-              </view> -->
               无图片
             </template>
             <template #loading>
@@ -67,6 +55,7 @@ function isControlType(item: Columns): string {
               </view>
             </template>
           </wd-img>
+          <!-- 视频 -->
           <view
             v-else-if="['mp4', 'mov', 'wmv', 'avi', 'rmvb', 'flv', 'mkv'].includes(uitem.type)"
             style="width: 70px;height: 70px;display: flex;align-items: center;justify-content: center;border: 1px solid #ccc;border-radius: 4px;"
@@ -74,6 +63,12 @@ function isControlType(item: Columns): string {
           >
             <wd-icon name="play-circle-filled" size="22px" />
           </view>
+          <!-- 文件 -->
+          <view v-else-if="['doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx', 'pdf', 'txt', 'zip', 'rar', '7z', 'gz', 'bz2', 'tar', 'iso', 'exe', 'dmg', 'apk', 'apk', 'apk', 'apk', 'apk', 'apk', 'apk', 'apk'].includes(uitem.type)">
+            <span :style="{ color: primary }" @click="downloadFile(uitem.url)">
+              {{ uitem.name }}
+            </span>
+          </view>
         </view>
       </view>
     </view>

package/composables/useManualTheme.ts

@@ -146,6 +146,7 @@ export function useManualTheme() {
   return {
     // 状态
     theme: computed(() => store.theme),
+    // 主题色
     primary: computed(() => store.themeVars.colorTheme),
     isDark: computed(() => store.isDark),
     followSystem: computed(() => store.followSystem),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wui-components-v2",
-  "version": "1.0.96",
+  "version": "1.0.98",
   "description": "wui 组件库",
   "author": "wgxshh",
   "license": "MIT",

package/type.ts

@@ -1,3 +1,23 @@
+export type Comparator =
+  | 'contain'
+  | 'equal'
+  | 'equals'
+  | 'unequal'
+  | 'unequals'
+  | 'includeOne'
+  | 'include_anyone'
+  | 'include_all'
+  | 'noless'
+  | 'nogreater'
+  | 'less'
+  | 'greater'
+  | 'exclude'
+  | 'noLess'
+  | 'noGreater'
+  | 'Less'
+  | 'Greater'
+  | 'none1' | 'none1n'
+
 // 列表字段配置
 export interface Columns {
   controlType: string
@@ -50,6 +70,7 @@ export interface Fields extends Columns {
   required: boolean
   max?: string
   min?: string
+  comparator?: Comparator
 }
 
 // 编辑按钮配置

package/utils/index.ts

@@ -1,3 +1,5 @@
+import type { Comparator } from '../type'
+
 const baseUrl = uni.getStorageSync('BASE_URL')
 const token = uni.getStorageSync('TOKEN')
 const hydrocarbonProgramToken = uni.getStorageSync('HYDROCARBON_PROGRAM_TOKEN')
@@ -44,7 +46,7 @@ export function formatItemData(data: any, type: string) {
         const a = JSON.parse(data)
         return [{
           url: `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}&name=${a.base.fileName || ''}`,
-          name: a.base.path.fileName,
+          name: a.base.fileName,
           type: a.base.type,
         }]
       }
@@ -54,7 +56,7 @@ export function formatItemData(data: any, type: string) {
             const a = JSON.parse(item.split('@R@')[1])
             return [{
               url: `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}&name=${a.base.fileName || ''}`,
-              name: a.base.path.fileName,
+              name: a.base.fileName,
               type: a.base.type,
             }]
           }
@@ -62,7 +64,7 @@ export function formatItemData(data: any, type: string) {
             const a = JSON.parse(item)
             return [{
               url: `${baseUrl}/v3/files${a.base.path}?@token=${token}&@programToken=${hydrocarbonProgramToken}&name=${a.base.fileName || ''}`,
-              name: a.base.path.fileName,
+              name: a.base.fileName,
               type: a.base.type,
             }]
           }
@@ -95,7 +97,7 @@ export function generateHighResolutionID(): string {
 }
 
 // 下载文件
-export function downloadFile(url: any) {
+export function downloadFile(url: string) {
   console.log('下载', url)
   uni.downloadFile({
     url, // 文件的网络地址
@@ -138,3 +140,172 @@ function getAfterLastMatch(str: string, pattern: string) {
     return null
   return str.substring(lastIndex + pattern.length)
 }
+
+/****
+ *
+ * 根据comparator、defaultValue、val
+ * 判断按钮是否满洲显示
+ *
+ *
+ */
+export function comparator(
+  comparator: Comparator,
+  val: string,
+  defaultValue: string,
+): boolean {
+  let dvs: string[]
+  let value = val
+  if (val && val.indexOf && val.indexOf('@R@') > 0) {
+    const vs = val.split('@R@')
+    value = vs[1]
+  }
+
+  if (!comparator) {
+    comparator = 'equals'
+  }
+
+  if (comparator === 'none1') {
+    return !value || value === ''
+  }
+  else if (comparator === 'none1n') {
+    return !!value && value !== ''
+  }
+
+  if (!defaultValue) {
+    return true
+  }
+
+  if (!value && value !== '0') {
+    return false
+  }
+  let vals
+  switch (comparator) {
+    case 'contain':
+      return value.includes(defaultValue)
+    case 'equal':
+    case 'equals':
+      return isEqual(value, defaultValue)
+    case 'exclude':
+      dvs = toArray(defaultValue)
+      vals = toArray(value)
+      for (let i = 0; i < dvs.length; i++) {
+        for (let j = 0; j < vals.length; j++) {
+          if (dvs[i] === vals[j]) {
+            return false
+          }
+        }
+      }
+      return true
+    case 'includeOne':
+    case 'include_anyone':
+      dvs = toArray(defaultValue)
+      vals = toArray(value)
+      for (let i = 0; i < dvs.length; i++) {
+        for (let j = 0; j < vals.length; j++) {
+          if (dvs[i] === vals[j]) {
+            return true
+          }
+        }
+      }
+      return false
+
+    case 'include_all':
+    { dvs = toArray(defaultValue)
+      vals = toArray(value)
+      let count = 0
+      const targetCount = dvs.length
+      for (let i = 0; i < dvs.length; i++) {
+        for (let j = 0; j < vals.length; j++) {
+          if (dvs[i] === vals[j]) {
+            count++
+            break
+          }
+        }
+      }
+      return targetCount <= count }
+    case 'Greater':
+    case 'greater':
+      if (!Number.isNaN(Number(value)) && !Number.isNaN(Number(defaultValue))) {
+        return Number(value) > Number(defaultValue)
+      }
+      else {
+        return value > defaultValue
+      }
+    case 'Less':
+    case 'less':
+      if (!Number.isNaN(Number(value)) && !Number.isNaN(Number(defaultValue))) {
+        return Number(value) < Number(defaultValue)
+      }
+      else {
+        return value < defaultValue
+      }
+    case 'noGreater':
+    case 'nogreater':
+      if (!Number.isNaN(Number(value)) && !Number.isNaN(Number(defaultValue))) {
+        return Number(value) <= Number(defaultValue)
+      }
+      else {
+        return value <= defaultValue
+      }
+    case 'noLess':
+    case 'noless':
+      if (!Number.isNaN(Number(value)) && !Number.isNaN(Number(defaultValue))) {
+        return Number(value) >= Number(defaultValue)
+      }
+      else {
+        return value >= defaultValue
+      }
+    case 'unequal':
+    case 'unequals':
+      return !isEqual(value, defaultValue)
+    default:
+      console.log(`暂不支持的比较关系：${comparator};请联系管理员添加。`)
+      return false // 兜底返回值
+  }
+}
+
+function isEqual(value: string, defaultValue: string) {
+  if (defaultValue === '是' || defaultValue === '否' || defaultValue === 'true' || defaultValue === 'false') {
+    if (value === 'true' || value === '是') {
+      if (defaultValue === '是' || defaultValue === 'true') {
+        return true
+      }
+      else {
+        return false
+      }
+    }
+    else if (value === 'false' || value === '否') {
+      if (defaultValue === '否' || defaultValue === 'false') {
+        return true
+      }
+      else {
+        return false
+      }
+    }
+    else {
+      return false
+    }
+  }
+  else {
+    if (!Number.isNaN(Number(value)) && !Number.isNaN(Number(defaultValue))) {
+      return Number(value) === Number(defaultValue)
+    }
+    else {
+      return value === defaultValue
+    }
+  }
+}
+
+function toArray(value: string) {
+  let val
+  if (typeof value == 'string') {
+    val = value.split(',')
+  }
+  else if (Array.isArray(value)) {
+    val = value
+  }
+  else {
+    val = [value]
+  }
+  return val
+}