uni-oaview 1.0.30 → 1.0.32

package/components/oa-area-select/oa-area-select.vue

@@ -1,6 +1,11 @@
 <template>
   <view v-bind="$attrs" class="oa-area-select" @click="() => (popupShow = true)">
-    <view class="oa-area-select-content">{{ currentLabel }}</view>
+    <view class="oa-area-select-content">
+      <text v-if="modelValue?.length">
+        {{ currentLabel }}
+      </text>
+      <text v-else class="oa-area-select-placeholder">{{ $attrs.placeholder ?? '请选择' }}</text>
+    </view>
     <uni-icons style="margin-left: 10px" type="forward" size="20" :color="'#ADB2B6'"></uni-icons>
   </view>
   <oa-area-select-popup
@@ -12,7 +17,7 @@
   ></oa-area-select-popup>
 </template>
 <script lang="ts" setup>
-  import { ref, watchEffect, nextTick } from 'vue';
+  import { ref, watchEffect } from 'vue';
   import OaAreaSelectPopup from '../oa-area-select-popup/oa-area-select-popup.vue';
   import { getCascaderNameByIds } from './util';
   import regionData from '../oa-area-select-popup/region-data';
@@ -46,5 +51,10 @@
       justify-content: flex-end;
       font-size: 16px;
     }
+    .oa-area-select-placeholder {
+      font-size: 16px;
+      color: #c5cace;
+      font-weight: 300;
+    }
   }
 </style>

package/components/oa-area-select-popup/oa-area-select-popup.vue

@@ -45,11 +45,13 @@
     if (props.modelValue?.length) {
       const [province, city, area] = props.modelValue;
       cityList.value = provinceList.value.find(({ value }) => value === province)?.children ?? [
-        { value: 'city-empty', label: '' },
-      ];
-      areaList.value = cityList.value?.find(({ value }) => value === city)?.children ?? [
-        { value: 'area-empty', label: '' },
+        { value: 'city-empty', label: '空' },
       ];
+      areaList.value = [{ value: 'area-empty', label: '空' }];
+      const areas = cityList.value?.find(({ value }) => value === city)?.children;
+      if (areas?.length) {
+        areaList.value.push(...areas);
+      }
       state.value = [provinceList.value.findIndex((item) => item.value === province)];
       if (city) {
         state.value.push(cityList.value.findIndex((item) => item.value === city));
@@ -62,8 +64,12 @@
         state.value.push(0);
       }
     } else {
-      cityList.value = provinceList.value?.[0]?.children ?? [{ value: 'city-empty', label: '' }];
-      areaList.value = cityList.value?.[0]?.children ?? [{ value: 'area-empty', label: '' }];
+      cityList.value = provinceList.value?.[0]?.children ?? [{ value: 'city-empty', label: '空' }];
+      areaList.value = [{ value: 'area-empty', label: '空' }];
+      const areas = cityList.value?.[0]?.children;
+      if (areas?.length) {
+        areaList.value.push(...areas);
+      }
     }
   };
   const emit = defineEmits(['change', 'update:modelValue', 'colse', 'update:show']);
@@ -96,8 +102,11 @@
     state.value = e.detail.value; // 当前选中的省/市/区的索引值
     const selectedProvince = provinceList.value[state.value[0]]; // 获取当前选中的省数据
     const selectedCity = selectedProvince?.children?.[state.value[1]]; // 获取当前选中的市数据
-    cityList.value = selectedProvince?.children || [{ value: 'city-empty', label: '' }]; // 根据新的省数据重新赋值市数据
-    areaList.value = selectedCity?.children || [{ value: 'area-empty', label: '' }]; // 根据新的市数据重新赋值区数据
+    cityList.value = selectedProvince?.children || [{ value: 'city-empty', label: '空' }]; // 根据新的省数据重新赋值市数据
+    areaList.value = [{ value: 'area-empty', label: '空' }]; // 根据新的市数据重新赋值区数据
+    if (selectedCity?.children?.length) {
+      areaList.value.push(...selectedCity?.children); // 根据新的市数据重新赋值区数据
+    }
   }, 200);
 </script>
 

package/components/oa-multiple-select-popup/oa-multiple-select-popup.vue

@@ -8,17 +8,19 @@
         <text v-if="innerModelValue?.length">({{ innerModelValue?.length }})</text>
       </view>
     </view>
-    <view class="content-box">
-      <view @click="clickHandler(item)" class="content-item" v-for="item in options" :key="item[valueKey ?? 'value']">
-        <uni-icons
-          class="content-item-icon"
-          :type="innerModelValue?.includes(item[valueKey ?? 'value']) ? 'checkbox-filled' : 'circle'"
-          size="25"
-          :color="innerModelValue?.includes(item[valueKey ?? 'value']) ? '#259af5' : '#c5cace'"
-        ></uni-icons>
-        <text class="content-item-text" style="margin-left: 8px">{{ item[labelKey ?? 'label'] }}</text>
+    <scroll-view style="height: 300px" :scroll-y="true">
+      <view class="content-box">
+        <view @click="clickHandler(item)" class="content-item" v-for="item in options" :key="item[valueKey ?? 'value']">
+          <uni-icons
+            class="content-item-icon"
+            :type="innerModelValue?.includes(item[valueKey ?? 'value']) ? 'checkbox-filled' : 'circle'"
+            size="25"
+            :color="innerModelValue?.includes(item[valueKey ?? 'value']) ? '#259af5' : '#c5cace'"
+          ></uni-icons>
+          <text class="content-item-text" style="margin-left: 8px">{{ item[labelKey ?? 'label'] }}</text>
+        </view>
       </view>
-    </view>
+    </scroll-view>
   </oa-popup>
 </template>
 
@@ -90,8 +92,7 @@
     }
   }
   .content-box {
-    height: 300px;
-    overflow-y: auto;
+    height: 100%;
     & > .content-item {
       height: 54px;
       display: flex;

package/dist/index.esm.js

@@ -11,6 +11,7 @@ function sendLaunchAppParamsLog(params) {
   try {
     var outputData = JSON.parse(JSON.stringify((_a = params === null || params === void 0 ? void 0 : params.referrerInfo) === null || _a === void 0 ? void 0 : _a.extraData));
     outputData === null || outputData === void 0 ? true : delete outputData.token;
+    outputData === null || outputData === void 0 ? true : delete outputData.loginUserInfo;
     reportLog(outputData, '小程序启动入参');
   } catch (error) {
     console.log(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni-oaview",
-  "version": "1.0.30",
+  "version": "1.0.32",
   "description": "uniapp小程序组件库",
   "main": "dist/index.esm.js",
   "typings": "dist/index.d.ts",

package/src/utils/send-log.ts

@@ -10,6 +10,7 @@ export function sendLaunchAppParamsLog(params: any) {
   try {
     const outputData = JSON.parse(JSON.stringify(params?.referrerInfo?.extraData));
     delete outputData?.token;
+    delete outputData?.loginUserInfo;
     reportLog(outputData, '小程序启动入参');
   } catch (error) {
     console.log(error);