wui-components-v2 1.1.70 → 1.1.72

package/components/wui-notify-info/notify-handle.vue

@@ -1,53 +1,53 @@
-<script setup lang="ts">
-import { defineOptions, ref } from 'vue'
-import { onLoad } from '@dcloudio/uni-app'
-import wuiDetailsPage from '../wui-details-page/wui-details-page.vue'
-import cardBotomButtons from '../card-botom-buttons/card-botom-buttons.vue'
-
-defineOptions({
-  name: 'NotifyHandle',
-})
-const item = ref<any>(null)
-const sourceId = ref<any>(null)
-const pagedata = ref<any>(null)
-const rowActions = ref<any>(null)
-const actions = ref<any>(null)
-const ractions = ref<any>(null)
-const primaryColumn = ref<any>(null)
-const enumColumn = ref<any>(null)
-onLoad(() => {
-  console.log('load')
-  uni.$on('notify-click', (data: any) => {
-    console.log(data, 'kkkk')
-    item.value = data.item
-    sourceId.value = data.sourceId
-    pagedata.value = data.data
-    rowActions.value = data.rowActions
-    actions.value = data.actions
-    ractions.value = data.ractions
-    primaryColumn.value = data.primaryColumn
-    enumColumn.value = data.enumColumn
-  })
-})
-onUnload(() => {
-  console.log('unload')
-  uni.$off('notify-click')
-})
-</script>
-
-<template>
-  <view>
-    <wuiDetailsPage>
-      <template #botombuttons>
-        <view class="flex justify-end bg-#ffff p-4">
-          <cardBotomButtons v-if="sourceId" :item="item" :source-id="sourceId" :code="pagedata.code" :data="pagedata" :row-actions="rowActions" :actions="actions" :ractions="ractions" :primary-column="primaryColumn" />
-        </view>
-      </template>
-    </wuiDetailsPage>
-    <view />
-  </view>
-</template>
-
-<style scoped>
-
-</style>
+<script setup lang="ts">
+import { defineOptions, ref } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
+import wuiDetailsPage from '../wui-details-page/wui-details-page.vue'
+import cardBotomButtons from '../card-botom-buttons/card-botom-buttons.vue'
+
+defineOptions({
+  name: 'NotifyHandle',
+})
+const item = ref<any>(null)
+const sourceId = ref<any>(null)
+const pagedata = ref<any>(null)
+const rowActions = ref<any>(null)
+const actions = ref<any>(null)
+const ractions = ref<any>(null)
+const primaryColumn = ref<any>(null)
+const enumColumn = ref<any>(null)
+onLoad(() => {
+  console.log('load')
+  uni.$on('notify-click', (data: any) => {
+    console.log(data, 'kkkk')
+    item.value = data.item
+    sourceId.value = data.sourceId
+    pagedata.value = data.data
+    rowActions.value = data.rowActions
+    actions.value = data.actions
+    ractions.value = data.ractions
+    primaryColumn.value = data.primaryColumn
+    enumColumn.value = data.enumColumn
+  })
+})
+onUnload(() => {
+  console.log('unload')
+  uni.$off('notify-click')
+})
+</script>
+
+<template>
+  <view>
+    <wuiDetailsPage>
+      <template #botombuttons>
+        <view class="flex justify-end bg-#ffff p-4">
+          <cardBotomButtons v-if="sourceId" :item="item" :source-id="sourceId" :code="pagedata.code" :data="pagedata" :row-actions="rowActions" :actions="actions" :ractions="ractions" :primary-column="primaryColumn" />
+        </view>
+      </template>
+    </wuiDetailsPage>
+    <view />
+  </view>
+</template>
+
+<style scoped>
+
+</style>

package/components/wui-scan-binding-sensor/wui-scan-binding-sensor.vue

@@ -1,75 +1,75 @@
-<script setup lang="ts">
-import { ref, watch } from 'vue'
-import { onShow } from '@dcloudio/uni-app'
-
-defineOptions({
-  name: 'WuiScanBindingSensor',
-})
-// 传感器编号
-const code = ref('')
-onShow(() => {
-  code.value = uni.getStorageSync('sensorCode')
-})
-watch(code, (value) => {
-  uni.setStorageSync('sensorCode', value)
-})
-// 扫码
-function scan() {
-  uni.scanCode({
-    fail: () => {
-      uni.showToast({
-        title: '扫码失败',
-        icon: 'error',
-      })
-    },
-    success: (e) => {
-      if (!e.result) {
-        return uni.showToast({
-          title: '扫码结果为空',
-          icon: 'error',
-        })
-      }
-      // 判断扫码结果与当前保存的传感器编号是否一致
-      if (e.result !== uni.getStorageSync('sensorCode')) {
-        uni.showToast({
-          title: '更新设备成功',
-        })
-      }
-      code.value = e.result // 扫码结果
-      uni.setStorageSync('sensorCode', e.result)
-      enter()
-    },
-  })
-}
-function enter() {
-  uni.navigateBack()
-}
-</script>
-
-<template>
-  <view class="bindBox">
-    <view class="iconBox">
-      <wd-icon name="scan" size="150rpx" @click="scan" />
-    </view>
-    <wd-input v-model="code" placeholder="请输入传感器编号" />
-    <wd-button @click="enter">
-      确认
-    </wd-button>
-  </view>
-</template>
-
-<style lang="scss" scoped>
-.bindBox {
-  background-color: #fff;
-  display: flex;
-  flex-direction: column;
-  gap: 20rpx;
-  justify-content: center;
-  padding: 32rpx;
-
-  .iconBox {
-    display: flex;
-    justify-content: center;
-  }
-}
-</style>
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { onShow } from '@dcloudio/uni-app'
+
+defineOptions({
+  name: 'WuiScanBindingSensor',
+})
+// 传感器编号
+const code = ref('')
+onShow(() => {
+  code.value = uni.getStorageSync('sensorCode')
+})
+watch(code, (value) => {
+  uni.setStorageSync('sensorCode', value)
+})
+// 扫码
+function scan() {
+  uni.scanCode({
+    fail: () => {
+      uni.showToast({
+        title: '扫码失败',
+        icon: 'error',
+      })
+    },
+    success: (e) => {
+      if (!e.result) {
+        return uni.showToast({
+          title: '扫码结果为空',
+          icon: 'error',
+        })
+      }
+      // 判断扫码结果与当前保存的传感器编号是否一致
+      if (e.result !== uni.getStorageSync('sensorCode')) {
+        uni.showToast({
+          title: '更新设备成功',
+        })
+      }
+      code.value = e.result // 扫码结果
+      uni.setStorageSync('sensorCode', e.result)
+      enter()
+    },
+  })
+}
+function enter() {
+  uni.navigateBack()
+}
+</script>
+
+<template>
+  <view class="bindBox">
+    <view class="iconBox">
+      <wd-icon name="scan" size="150rpx" @click="scan" />
+    </view>
+    <wd-input v-model="code" placeholder="请输入传感器编号" />
+    <wd-button @click="enter">
+      确认
+    </wd-button>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+.bindBox {
+  background-color: #fff;
+  display: flex;
+  flex-direction: column;
+  gap: 20rpx;
+  justify-content: center;
+  padding: 32rpx;
+
+  .iconBox {
+    display: flex;
+    justify-content: center;
+  }
+}
+</style>

package/components/wui-search-history-babbar/components/SearchBar.vue

@@ -1,70 +1,70 @@
-<script setup lang="ts">
-const props = defineProps<{
-  modelValue: string[]
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:modelValue', value: string[]): void
-  (e: 'select', value: string): void
-}>()
-
-const MAX_HISTORY = 5
-
-function addToHistory(keyword: string) {
-  if (!keyword.trim())
-    return
-  const current = [...props.modelValue]
-  const index = current.indexOf(keyword)
-  if (index > -1) {
-    current.splice(index, 1)
-  }
-  current.unshift(keyword)
-  if (current.length > MAX_HISTORY) {
-    current.pop()
-  }
-  emit('update:modelValue', current)
-}
-
-function removeFromHistory(keyword: string) {
-  const current = props.modelValue.filter(k => k !== keyword)
-  emit('update:modelValue', current)
-}
-
-function clearHistory() {
-  emit('update:modelValue', [])
-}
-
-defineExpose({ addToHistory })
-</script>
-
-<template>
-  <view v-if="modelValue.length > 0" class="mt-4">
-    <view class="mb-3 flex items-center justify-between">
-      <view class="flex items-center gap-2">
-        <!-- <ClockIcon class="h-4 w-4 text-slate-400" /> -->
-        <view class="text-sm text-slate-600 font-medium">
-          搜索历史
-        </view>
-      </view>
-      <view
-        class="cursor-pointer text-xs text-slate-400 transition-colors hover:text-indigo-500"
-        @click="clearHistory"
-      >
-        清空
-      </view>
-    </view>
-    <view class="flex flex-wrap gap-2">
-      <view
-        v-for="keyword in modelValue"
-        :key="keyword"
-        class="group flex cursor-pointer items-center gap-1.5 rounded-full bg-white px-3 py-1.5 text-sm text-slate-600 shadow-sm transition-all duration-200 hover:text-indigo-500 hover:shadow-md"
-        @click="emit('select', keyword)"
-      >
-        <!-- <MagnifyingGlassCircleIcon class="h-3.5 w-3.5" /> -->
-        <view>{{ keyword }}</view>
-        <wd-icon name="close-normal" size="16px" class="flex items-center" @click.stop="removeFromHistory(keyword)" />
-        <!-- <wd-icon name="close-bold" size="22px" @click.stop="removeFromHistory(keyword)" ></wd-icon> -->
-      </view>
-    </view>
-  </view>
-</template>
+<script setup lang="ts">
+const props = defineProps<{
+  modelValue: string[]
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:modelValue', value: string[]): void
+  (e: 'select', value: string): void
+}>()
+
+const MAX_HISTORY = 5
+
+function addToHistory(keyword: string) {
+  if (!keyword.trim())
+    return
+  const current = [...props.modelValue]
+  const index = current.indexOf(keyword)
+  if (index > -1) {
+    current.splice(index, 1)
+  }
+  current.unshift(keyword)
+  if (current.length > MAX_HISTORY) {
+    current.pop()
+  }
+  emit('update:modelValue', current)
+}
+
+function removeFromHistory(keyword: string) {
+  const current = props.modelValue.filter(k => k !== keyword)
+  emit('update:modelValue', current)
+}
+
+function clearHistory() {
+  emit('update:modelValue', [])
+}
+
+defineExpose({ addToHistory })
+</script>
+
+<template>
+  <view v-if="modelValue.length > 0" class="mt-4">
+    <view class="mb-3 flex items-center justify-between">
+      <view class="flex items-center gap-2">
+        <!-- <ClockIcon class="h-4 w-4 text-slate-400" /> -->
+        <view class="text-sm text-slate-600 font-medium">
+          搜索历史
+        </view>
+      </view>
+      <view
+        class="cursor-pointer text-xs text-slate-400 transition-colors hover:text-indigo-500"
+        @click="clearHistory"
+      >
+        清空
+      </view>
+    </view>
+    <view class="flex flex-wrap gap-2">
+      <view
+        v-for="keyword in modelValue"
+        :key="keyword"
+        class="group flex cursor-pointer items-center gap-1.5 rounded-full bg-white px-3 py-1.5 text-sm text-slate-600 shadow-sm transition-all duration-200 hover:text-indigo-500 hover:shadow-md"
+        @click="emit('select', keyword)"
+      >
+        <!-- <MagnifyingGlassCircleIcon class="h-3.5 w-3.5" /> -->
+        <view>{{ keyword }}</view>
+        <wd-icon name="close-normal" size="16px" class="flex items-center" @click.stop="removeFromHistory(keyword)" />
+        <!-- <wd-icon name="close-bold" size="22px" @click.stop="removeFromHistory(keyword)" ></wd-icon> -->
+      </view>
+    </view>
+  </view>
+</template>

package/components/wui-select-list/wui-select-list.vue

@@ -150,15 +150,7 @@ async function queryList(pageNo: number, pageSize: number) {
   // paging.value.reload() // 手动触发加载
   // })
 
-  const search = uni.getStorageSync('paramsData')?.changedData || {}
-    const newParams = {
-      thirdCriterion: search.relValueField3 || '',
-      secondCriterion: search.relValueField?.toString() || '',
-    }
-  const params = Object.entries(newParams)
-    .map(([key, value]) => `${key}=${value}`)
-    .join('&')
-  let qre = searchData.value ? `${searchData.value + '&' + params}` : params
+  let qre = searchData.value
   if (config.value.defaultCriteriaValue) {
     for (const key in config.value.defaultCriteriaValue) {
       if (Object.prototype.hasOwnProperty.call(config.value.defaultCriteriaValue, key)) {

package/components/wui-select-popup/wui-select-popup.vue

@@ -401,6 +401,7 @@ defineExpose({
     show.value = false
   },
 })
+console.log(props, 'props')
 </script>
 
 <template>