wui-components-v2 1.1.69 → 1.1.70

package/components/wui-user/wui-user.vue

@@ -1,202 +1,202 @@
-<script setup lang="ts">
-import { computed, ref } from 'vue'
-import { useDialog } from '@wot-ui/ui'
-import { useUser } from '../../composables/useUser'
-import { generateGradientColor } from '../../utils'
-import { useManualTheme } from '../../composables/useManualTheme'
-import scan from '../scan-input/scan-input.vue'
-import { getUserConfig } from '../../api/login'
-import { useGlobalToast } from '../../composables/useGlobalToast'
-
-defineOptions({
-  name: 'WuiUser',
-})
-const props = defineProps({
-  loginPath: {
-    type: String,
-    default: '/pages/login/index',
-  },
-  showLogout: {
-    type: Boolean,
-    default: true,
-  },
-})
-
-const { currentThemeColor, isDark } = useManualTheme()
-
-// Cell 暗黑样式 - 通过 custom-style 直接注入组件内联样式
-const cellStyle = computed(() => ({
-  backgroundColor: isDark.value ? '#161616' : '#fff',
-  borderBottom: isDark.value ? '1px solid rgba(255,255,255,0.04)' : 'none',
-}))
-
-// CellGroup 暗黑样式
-const cellGroupStyle = computed(() => ({
-  backgroundColor: isDark.value ? '#111111' : 'transparent',
-  borderRadius: isDark.value ? '10px' : '0',
-}))
-const user = useUser().getUserInfo()
-const dialog = useDialog()
-const toast = useGlobalToast()
-const userInfo = ref({
-  name: user.name,
-  nickName: user.nickName,
-})
-
-// 退出登录
-function quit() {
-  dialog
-    .confirm({
-      title: '退出登录',
-    })
-    .then(() => {
-      uni.removeStorageSync('TOKEN')
-      uni.reLaunch({
-        url: props.loginPath,
-      })
-    })
-    .catch(() => {
-      console.log('点击了取消按钮')
-    })
-}
-
-// 系统设置
-function setting() {
-  uni.navigateTo({
-    url: '/pages/system-settings/index',
-  })
-}
-async function clearCache() {
-  const res = await getUserConfig()
-  if (res.status == 'success') {
-    toast.success({ msg: '清除成功！' })
-    uni.setStorageSync('userInfo', res.user)
-  }
-}
-</script>
-
-<template>
-  <view class="user">
-    <view class="top-box">
-      <!-- 用户头部信息 -->
-      <view
-        class="user-header"
-        :style="{
-          background: isDark
-            ? 'linear-gradient(135deg, #1a1a2e 0%, #16213e 100%)'
-            : generateGradientColor(currentThemeColor.primary, 135, 1, 0.7),
-          boxShadow: isDark
-            ? '0 2px 12px rgba(0,0,0,0.4), inset 0 1px 0 rgba(255,255,255,0.05)'
-            : '0 4px 12px rgba(74, 108, 247, 0.25)',
-          border: isDark ? '1px solid rgba(255,255,255,0.06)' : 'none',
-          borderRadius: '10px',
-        }"
-      >
-        <view class="user-info">
-          <image
-            class="avatar"
-            src="./user-avatar-fill.png"
-            :style="{ borderColor: isDark ? 'rgba(255,255,255,0.2)' : 'rgba(255,255,255,0.3)' }"
-          />
-          <view class="user-text">
-            <view class="user-name">{{ userInfo.name }}</view>
-            <view class="user-nickname">昵称：{{ userInfo.nickName }}</view>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <view class="mx-[15px] rounded-2">
-      <wd-cell-group :custom-style="cellGroupStyle">
-        <wd-cell
-          title="系统设置"
-          icon="setting"
-          :is-link="true"
-          :clickable="true"
-          :custom-style="cellStyle"
-          @click="setting"
-        />
-        <wd-cell title="清空缓存" :is-link="true" :clickable="true" :custom-style="cellStyle" @click="clearCache" />
-        <wd-cell
-          v-if="showLogout"
-          title="退出登录"
-          icon="logout"
-          :is-link="true"
-          :clickable="true"
-          :custom-style="cellStyle"
-          @click="quit"
-        />
-      </wd-cell-group>
-    </view>
-    <wd-dialog />
-  </view>
-</template>
-
-<style scoped lang="scss">
-.user {
-  .top-box {
-    padding: 15px;
-
-    .user-header {
-      color: white;
-      padding: 30px 20px;
-      position: relative;
-      overflow: hidden;
-    }
-
-    .user-header::before {
-      content: '';
-      position: absolute;
-      top: -50px;
-      right: -50px;
-      width: 150px;
-      height: 150px;
-      background: rgba(255, 255, 255, 0.1);
-      border-radius: 50%;
-    }
-
-    .user-header::after {
-      content: '';
-      position: absolute;
-      bottom: -80px;
-      left: -30px;
-      width: 200px;
-      height: 200px;
-      background: rgba(255, 255, 255, 0.05);
-      border-radius: 50%;
-    }
-
-    .user-info {
-      display: flex;
-      align-items: center;
-      position: relative;
-      z-index: 1;
-    }
-
-    .avatar {
-      width: 120rpx;
-      height: 120rpx;
-      border-radius: 50%;
-      margin-right: 15px;
-      object-fit: cover;
-    }
-
-    .user-text {
-      flex: 1;
-    }
-
-    .user-name {
-      font-size: 20px;
-      font-weight: 600;
-      margin-bottom: 5px;
-    }
-
-    .user-nickname {
-      font-size: 14px;
-      opacity: 0.9;
-      display: flex;
-      align-items: center;
-    }
-  }
-}
-</style>
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { useDialog } from '@wot-ui/ui'
+import { useUser } from '../../composables/useUser'
+import { generateGradientColor } from '../../utils'
+import { useManualTheme } from '../../composables/useManualTheme'
+import scan from '../scan-input/scan-input.vue'
+import { getUserConfig } from '../../api/login'
+import { useGlobalToast } from '../../composables/useGlobalToast'
+
+defineOptions({
+  name: 'WuiUser',
+})
+const props = defineProps({
+  loginPath: {
+    type: String,
+    default: '/pages/login/index',
+  },
+  showLogout: {
+    type: Boolean,
+    default: true,
+  },
+})
+
+const { currentThemeColor, isDark } = useManualTheme()
+
+// Cell 暗黑样式 - 通过 custom-style 直接注入组件内联样式
+const cellStyle = computed(() => ({
+  backgroundColor: isDark.value ? '#161616' : '#fff',
+  borderBottom: isDark.value ? '1px solid rgba(255,255,255,0.04)' : 'none',
+}))
+
+// CellGroup 暗黑样式
+const cellGroupStyle = computed(() => ({
+  backgroundColor: isDark.value ? '#111111' : 'transparent',
+  borderRadius: isDark.value ? '10px' : '0',
+}))
+const user = useUser().getUserInfo()
+const dialog = useDialog()
+const toast = useGlobalToast()
+const userInfo = ref({
+  name: user.name,
+  nickName: user.nickName,
+})
+
+// 退出登录
+function quit() {
+  dialog
+    .confirm({
+      title: '退出登录',
+    })
+    .then(() => {
+      uni.removeStorageSync('TOKEN')
+      uni.reLaunch({
+        url: props.loginPath,
+      })
+    })
+    .catch(() => {
+      console.log('点击了取消按钮')
+    })
+}
+
+// 系统设置
+function setting() {
+  uni.navigateTo({
+    url: '/pages/system-settings/index',
+  })
+}
+async function clearCache() {
+  const res = await getUserConfig()
+  if (res.status == 'success') {
+    toast.success({ msg: '清除成功！' })
+    uni.setStorageSync('userInfo', res.user)
+  }
+}
+</script>
+
+<template>
+  <view class="user">
+    <view class="top-box">
+      <!-- 用户头部信息 -->
+      <view
+        class="user-header"
+        :style="{
+          background: isDark
+            ? 'linear-gradient(135deg, #1a1a2e 0%, #16213e 100%)'
+            : generateGradientColor(currentThemeColor.primary, 135, 1, 0.7),
+          boxShadow: isDark
+            ? '0 2px 12px rgba(0,0,0,0.4), inset 0 1px 0 rgba(255,255,255,0.05)'
+            : '0 4px 12px rgba(74, 108, 247, 0.25)',
+          border: isDark ? '1px solid rgba(255,255,255,0.06)' : 'none',
+          borderRadius: '10px',
+        }"
+      >
+        <view class="user-info">
+          <image
+            class="avatar"
+            src="./user-avatar-fill.png"
+            :style="{ borderColor: isDark ? 'rgba(255,255,255,0.2)' : 'rgba(255,255,255,0.3)' }"
+          />
+          <view class="user-text">
+            <view class="user-name">{{ userInfo.name }}</view>
+            <view class="user-nickname">昵称：{{ userInfo.nickName }}</view>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <view class="mx-[15px] rounded-2">
+      <wd-cell-group :custom-style="cellGroupStyle">
+        <wd-cell
+          title="系统设置"
+          icon="setting"
+          :is-link="true"
+          :clickable="true"
+          :custom-style="cellStyle"
+          @click="setting"
+        />
+        <wd-cell title="清空缓存" :is-link="true" :clickable="true" :custom-style="cellStyle" @click="clearCache" />
+        <wd-cell
+          v-if="showLogout"
+          title="退出登录"
+          icon="logout"
+          :is-link="true"
+          :clickable="true"
+          :custom-style="cellStyle"
+          @click="quit"
+        />
+      </wd-cell-group>
+    </view>
+    <wd-dialog />
+  </view>
+</template>
+
+<style scoped lang="scss">
+.user {
+  .top-box {
+    padding: 15px;
+
+    .user-header {
+      color: white;
+      padding: 30px 20px;
+      position: relative;
+      overflow: hidden;
+    }
+
+    .user-header::before {
+      content: '';
+      position: absolute;
+      top: -50px;
+      right: -50px;
+      width: 150px;
+      height: 150px;
+      background: rgba(255, 255, 255, 0.1);
+      border-radius: 50%;
+    }
+
+    .user-header::after {
+      content: '';
+      position: absolute;
+      bottom: -80px;
+      left: -30px;
+      width: 200px;
+      height: 200px;
+      background: rgba(255, 255, 255, 0.05);
+      border-radius: 50%;
+    }
+
+    .user-info {
+      display: flex;
+      align-items: center;
+      position: relative;
+      z-index: 1;
+    }
+
+    .avatar {
+      width: 120rpx;
+      height: 120rpx;
+      border-radius: 50%;
+      margin-right: 15px;
+      object-fit: cover;
+    }
+
+    .user-text {
+      flex: 1;
+    }
+
+    .user-name {
+      font-size: 20px;
+      font-weight: 600;
+      margin-bottom: 5px;
+    }
+
+    .user-nickname {
+      font-size: 14px;
+      opacity: 0.9;
+      display: flex;
+      align-items: center;
+    }
+  }
+}
+</style>

package/composables/useCompanyFieldFilter.ts

@@ -1,91 +1,91 @@
-import { computed, ref, watch } from 'vue'
-import type { Ref } from 'vue'
-import type { Groups } from '../type'
-
-const COMPANY_FIELD_SOURCE_ID = '' // 公司字段 sourceId
-
-export function useCompanyFieldFilter(
-  fieldGroup: () => Groups | undefined,
-  model: Ref<any>,
-  enabled: boolean = true,
-  companyFieldSourceId: string = COMPANY_FIELD_SOURCE_ID,
-) {
-  const deliveryCompanySourceId = ref<string>('')
-  const selectedCompany = ref<string>('')
-
-  if (enabled) {
-    watch(
-      () => fieldGroup()?.fields,
-      (newFields) => {
-        const companyField: any = newFields?.find((item: any) => item.sourceId === companyFieldSourceId) || {}
-        deliveryCompanySourceId.value = companyField.sourceId || ''
-      },
-      { deep: true, immediate: true },
-    )
-
-    // 直接监听 model 中对应字段的值变化
-    // 使用计算属性做中间层，确保 deliveryCompanySourceId 变化时重新建立依赖
-    const companyFieldValue = computed(() => {
-      const sourceId = deliveryCompanySourceId.value
-      if (!sourceId) return undefined
-      return model.value[sourceId]
-    })
-
-    watch(
-      companyFieldValue,
-      (newValue) => {
-        selectedCompany.value = newValue ? String(newValue).substring(0, 2) : ''
-      },
-      { immediate: true },
-    )
-  }
-
-  const formatFieldsItem=(company:string,item:any)=>{
-     const transDefaultValue = item.usableRuleCriterias?.[0]?.transDefaultValue||''
-      const isHidden=item?.unusableMode==='hidden'
-      const values = transDefaultValue.split(',').map(v => v.trim())
-    if(!company){
-      return {
-        ...item,
-        hidden:isHidden,
-      }
-    }else{
-
-      return {
-        ...item,
-        hidden: values.some(v => v.includes(company))?false:item.hidden,
-      }
-
-    }
-  }
-  const filteredFields = computed(() => {
-    const company = selectedCompany.value
-    const allFields = fieldGroup()?.fields
-    if (!allFields)
-      return []
-    const formattedFields = allFields.filter((item: any) => {
-      // 如果没有选中公司，所有字段都显示
-      if (!company) {
-        return true
-      }
-      // 检查 usableRuleCriterias 是否存在且有值
-      if (!item.usableRuleCriterias || item.usableRuleCriterias.length === 0) {
-        return true
-      }
-      // 获取 transDefaultValue 并检查是否包含选中的公司
-      const transDefaultValue = item.usableRuleCriterias?.[0]?.transDefaultValue
-      if (typeof transDefaultValue === 'string') {
-        const values = transDefaultValue.split(',').map(v => v.trim())
-        // console.log('transDefaultValue', company, 'values', values,values.includes(company))
-        return values.some(v => v.includes(company) )
-      }
-      return true
-    })
-    return formattedFields.map((item: any) => formatFieldsItem(company, item))
-  })
-  watch(filteredFields, (val) => {
-    // console.log('filteredFields变化了', val, 'selectedCompany:', selectedCompany.value)
-  }, { immediate: true })
-
-  return { filteredFields, selectedCompany }
-}
+import { computed, ref, watch } from 'vue'
+import type { Ref } from 'vue'
+import type { Groups } from '../type'
+
+const COMPANY_FIELD_SOURCE_ID = '' // 公司字段 sourceId
+
+export function useCompanyFieldFilter(
+  fieldGroup: () => Groups | undefined,
+  model: Ref<any>,
+  enabled: boolean = true,
+  companyFieldSourceId: string = COMPANY_FIELD_SOURCE_ID,
+) {
+  const deliveryCompanySourceId = ref<string>('')
+  const selectedCompany = ref<string>('')
+
+  if (enabled) {
+    watch(
+      () => fieldGroup()?.fields,
+      (newFields) => {
+        const companyField: any = newFields?.find((item: any) => item.sourceId === companyFieldSourceId) || {}
+        deliveryCompanySourceId.value = companyField.sourceId || ''
+      },
+      { deep: true, immediate: true },
+    )
+
+    // 直接监听 model 中对应字段的值变化
+    // 使用计算属性做中间层，确保 deliveryCompanySourceId 变化时重新建立依赖
+    const companyFieldValue = computed(() => {
+      const sourceId = deliveryCompanySourceId.value
+      if (!sourceId) return undefined
+      return model.value[sourceId]
+    })
+
+    watch(
+      companyFieldValue,
+      (newValue) => {
+        selectedCompany.value = newValue ? String(newValue).substring(0, 2) : ''
+      },
+      { immediate: true },
+    )
+  }
+
+  const formatFieldsItem=(company:string,item:any)=>{
+     const transDefaultValue = item.usableRuleCriterias?.[0]?.transDefaultValue||''
+      const isHidden=item?.unusableMode==='hidden'
+      const values = transDefaultValue.split(',').map(v => v.trim())
+    if(!company){
+      return {
+        ...item,
+        hidden:isHidden,
+      }
+    }else{
+
+      return {
+        ...item,
+        hidden: values.some(v => v.includes(company))?false:item.hidden,
+      }
+
+    }
+  }
+  const filteredFields = computed(() => {
+    const company = selectedCompany.value
+    const allFields = fieldGroup()?.fields
+    if (!allFields)
+      return []
+    const formattedFields = allFields.filter((item: any) => {
+      // 如果没有选中公司，所有字段都显示
+      if (!company) {
+        return true
+      }
+      // 检查 usableRuleCriterias 是否存在且有值
+      if (!item.usableRuleCriterias || item.usableRuleCriterias.length === 0) {
+        return true
+      }
+      // 获取 transDefaultValue 并检查是否包含选中的公司
+      const transDefaultValue = item.usableRuleCriterias?.[0]?.transDefaultValue
+      if (typeof transDefaultValue === 'string') {
+        const values = transDefaultValue.split(',').map(v => v.trim())
+        // console.log('transDefaultValue', company, 'values', values,values.includes(company))
+        return values.some(v => v.includes(company) )
+      }
+      return true
+    })
+    return formattedFields.map((item: any) => formatFieldsItem(company, item))
+  })
+  watch(filteredFields, (val) => {
+    // console.log('filteredFields变化了', val, 'selectedCompany:', selectedCompany.value)
+  }, { immediate: true })
+
+  return { filteredFields, selectedCompany }
+}

package/composables/useEnumes.ts

@@ -9,7 +9,7 @@ export function useEnums({ config }: { config: any }) {
   async function getEnums() {
     try {
       const params: string[] = []
-      const criterias = config.value?.criterias ?? []
+      const criteria = config.value?.criteria ?? []
       const columns = config.value.columns ?? []
       const writes = config.value.rowActions?.reduce((acc: any, cur: any) => {
         return [...acc, ...cur.writes]
@@ -19,7 +19,7 @@ export function useEnums({ config }: { config: any }) {
           params.push(`mstrucIds=${item.mstrucId}`)
         }
       })
-      criterias.forEach((item: any) => {
+      criteria.forEach((item: any) => {
         if (ControlTypeSupportor.getControlType(item) === 'select' || ControlTypeSupportor.getControlType(item) === 'multiselect') {
           params.push(`mstrucIds=${item.mstrucId}`)
         }