uni-oaview 1.0.31 → 1.0.33

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

@@ -50,7 +50,7 @@
       areaList.value = [{ value: 'area-empty', label: '空' }];
       const areas = cityList.value?.find(({ value }) => value === city)?.children;
       if (areas?.length) {
-        areaList.value = [{ value: 'area-empty', label: '空' }, ...areas];
+        areaList.value.push(...areas);
       }
       state.value = [provinceList.value.findIndex((item) => item.value === province)];
       if (city) {
@@ -68,7 +68,7 @@
       areaList.value = [{ value: 'area-empty', label: '空' }];
       const areas = cityList.value?.[0]?.children;
       if (areas?.length) {
-        areaList.value = [{ value: 'area-empty', label: '空' }, ...areas];
+        areaList.value.push(...areas);
       }
     }
   };
@@ -103,9 +103,9 @@
     const selectedProvince = provinceList.value[state.value[0]]; // 获取当前选中的省数据
     const selectedCity = selectedProvince?.children?.[state.value[1]]; // 获取当前选中的市数据
     cityList.value = selectedProvince?.children || [{ value: 'city-empty', label: '空' }]; // 根据新的省数据重新赋值市数据
-    areaList.value = [{ value: 'city-empty', label: '空' }]; // 根据新的市数据重新赋值区数据
+    areaList.value = [{ value: 'area-empty', label: '空' }]; // 根据新的市数据重新赋值区数据
     if (selectedCity?.children?.length) {
-      areaList.value = [{ value: 'city-empty', label: '空' }, ...selectedCity?.children]; // 根据新的市数据重新赋值区数据
+      areaList.value.push(...selectedCity?.children); // 根据新的市数据重新赋值区数据
     }
   }, 200);
 </script>

package/components/oa-login/oa-login.vue

@@ -86,6 +86,13 @@
         },
       },
       success: (res: any) => {
+        if (res?.data?.errno !== 0) {
+          uni.showToast({
+            title: res.data.errmsg,
+            icon: 'none',
+          });
+          return;
+        }
         const { uuid: id, email, ...otherParams } = res?.data?.data;
         const userInfo = {
           ...otherParams,

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/components/oa-page/loading-bar.vue

@@ -10,7 +10,7 @@
     position: fixed;
     top: 0;
     left: 0;
-    width: 100%;
+    width: 100vw;
     height: 2px;
     background-color: #ddd;
     z-index: 9999;

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

@@ -17,6 +17,7 @@
     @update:model-value="($event) => emit('update:modelValue', $event)"
     :options="options"
     @change="changeHandler"
+    @select-change="($event) => emit('change', $event)"
   >
     <!-- 透传作用域插槽内容到孙子组件 -->
     <template v-slot:default="slotProps">
@@ -25,7 +26,7 @@
   </oa-select-popup>
 </template>
 <script lang="ts" setup>
-  import { ref, watchEffect } from 'vue';
+  import { ref } from 'vue';
   import OaSelectPopup from '../oa-select-popup/oa-select-popup.vue';
   const props = defineProps<{
     title?: string;
@@ -36,16 +37,9 @@
   }>();
   const popupShow = ref(false);
   const currentLabel = ref('');
-  watchEffect(() => {
-    if (props.modelValue && props.options.length) {
-      currentLabel.value = props.options.find((item) => item[props.valueKey ?? 'value'] === props.modelValue)[
-        props.labelKey ?? 'label'
-      ];
-    }
-  });
   const emit = defineEmits(['change', 'close', 'update:modelValue']);
   const changeHandler = (val: any) => {
-    emit('change', val);
+    currentLabel.value = val?.[props.labelKey ?? 'label'];
   };
 </script>
 <style lang="scss" scoped>

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

@@ -28,7 +28,7 @@
     /** 标题 */
     title?: string;
     /** 值，数组 */
-    modelValue?: string | number | string[] | number[];
+    modelValue?: string | number;
     /** 弹窗显示 */
     show: boolean;
     options: Array<any>;
@@ -36,13 +36,32 @@
     valueKey?: string;
   }>();
   const indicatorStyle = `height: 40px;`;
-  const emit = defineEmits(['change', 'update:modelValue', 'colse', 'update:show']);
+  const emit = defineEmits(['change', 'select-change', 'update:modelValue', 'colse', 'update:show']);
   const indexList = ref<number[]>([]);
   const currentLabel = ref('');
+  /** 为了第一次初始化赋值的时候，也触发change，这样为了方式拿数据 */
+  const stopWatch = watch(
+    [() => props.modelValue, () => props.options],
+    () => {
+      setTimeout(() => {
+        if ((props.modelValue || props.modelValue === 0) && props.options.length) {
+          emit(
+            'change',
+            props.options.find((item) => item[props.valueKey ?? 'value'] === props.modelValue),
+          );
+          stopWatch();
+        }
+      });
+    },
+    {
+      immediate: true,
+    },
+  );
   watch(
     [() => props.show, () => props.options],
     () => {
       if (props.show) {
+        stopWatch();
         indexList.value = [
           Math.max(
             0,
@@ -53,6 +72,7 @@
     },
     { immediate: true },
   );
+
   const bindChange = useDebounceFn((e: any) => {
     const val = e.detail.value;
     nextTick(() => {
@@ -66,6 +86,7 @@
     const currentValue = newValue[props.valueKey ?? 'value'];
     emit('update:modelValue', currentValue);
     emit('change', newValue);
+    emit('select-change', newValue);
     emit('update:show', false);
   };
   const closeHandler = () => {

package/dist/index.d.ts

@@ -2,6 +2,14 @@ import { App } from 'vue';
 
 declare const _default: {
     install: (app: App<Element>) => void;
-};
+};
+/**
+ * 向客户端获取数据
+ * @param eventName  事件名称
+ * @param params 客户端传递事件的参数
+ * @param immediate 是否立即返回
+ * @returns
+ */
+declare function getDataByApp(eventName: string, params: Record<string, any>, immediate?: boolean): Promise<any>;
 
-export { _default as default };
+export { _default as default, getDataByApp };

package/dist/index.esm.js

@@ -1,5 +1,15 @@
 import { reportLog } from 'uniapp-log-sdk';
 
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
+}
+
 /**
  * 上报APP启动小程序的时候的入参
  * @param params
@@ -11,6 +21,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);
@@ -28,5 +39,34 @@ var install = function install(app) {
 var index = {
   install: install
 };
+/**
+ * 向客户端获取数据
+ * @param eventName  事件名称
+ * @param params 客户端传递事件的参数
+ * @param immediate 是否立即返回
+ * @returns
+ */
+function getDataByApp(eventName, params) {
+  var immediate = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  return new Promise(function (res, rej) {
+    var timeout = null;
+    if (immediate) {
+      timeout = setTimeout(rej, 5000);
+    }
+    if (params && _typeof(params) === 'object') {
+      try {
+        params = JSON.parse(JSON.stringify(params));
+      } catch (error) {
+        console.log(error);
+      }
+    }
+    uni.sendNativeEvent(eventName, params !== null && params !== void 0 ? params : {}, function (data) {
+      if (immediate) {
+        clearTimeout(timeout);
+      }
+      res(data);
+    });
+  });
+}
 
-export { index as default };
+export { index as default, getDataByApp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "uni-oaview",
-  "version": "1.0.31",
+  "version": "1.0.33",
   "description": "uniapp小程序组件库",
   "main": "dist/index.esm.js",
   "typings": "dist/index.d.ts",
@@ -44,16 +44,13 @@
     "rollup-plugin-typescript2": "^0.27.2",
     "rollup-plugin-vue": "^6.0.0",
     "typescript": "^4.0.2",
-    "uniapp-log-sdk": "^1.2.17",
-    "uview-plus": "^3.1.30"
+    "uniapp-log-sdk": "^1.2.17"
   },
   "peerDependencies": {
     "@dcloudio/uni-ui": "^1.4.26",
     "@vueuse/core": "^9.12.0",
-    "clipboard": "^2.0.11",
     "dayjs": "1.11.7",
-    "uniapp-log-sdk": "^1.1.1",
-    "uview-plus": "^3.1.30"
+    "uniapp-log-sdk": "^1.1.1"
   },
   "dependencies": {
     "element-china-area-data": "5.0.2"

package/src/index.ts

@@ -13,3 +13,32 @@ const install = (app: App<Element>) => {
 export default {
   install,
 };
+
+/**
+ * 向客户端获取数据
+ * @param eventName  事件名称
+ * @param params 客户端传递事件的参数
+ * @param immediate 是否立即返回
+ * @returns
+ */
+export function getDataByApp(eventName: string, params: Record<string, any>, immediate: boolean = false): Promise<any> {
+  return new Promise((res, rej) => {
+    let timeout: any = null;
+    if (immediate) {
+      timeout = setTimeout(rej, 5000);
+    }
+    if (params && typeof params === 'object') {
+      try {
+        params = JSON.parse(JSON.stringify(params));
+      } catch (error) {
+        console.log(error);
+      }
+    }
+    uni.sendNativeEvent(eventName, params ?? {}, (data: any) => {
+      if (immediate) {
+        clearTimeout(timeout);
+      }
+      res(data);
+    });
+  });
+}

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);

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

@@ -1,140 +0,0 @@
-<template>
-  <view>
-    <u-popup :show="modelValue" mode="bottom" @close="closeHandler" :closeOnClickOverlay="false">
-      <view class="button-box">
-        <view class="button-box-left" @click="closeHandler">取消</view>
-        <view class="button-box-center">{{ title }}</view>
-        <view class="button-box-right" @click="submit">确定</view>
-      </view>
-      <view class="search-box">
-        <view class="search-box-item">
-          <picker-view :indicator-style="indicatorStyle" :value="indexList" @change="bindChange" class="picker-view">
-            <picker-view-column>
-              <slot :columns="columns">
-                <view class="item" v-for="(item, index) in columns" :key="index">{{ item[labelKey ?? 'label'] }}</view>
-              </slot>
-            </picker-view-column>
-          </picker-view>
-        </view>
-      </view>
-    </u-popup>
-  </view>
-</template>
-<script lang="ts" setup>
-  import { ref, nextTick, watch } from 'vue';
-  import { useDebounceFn } from '@vueuse/core';
-  const props = defineProps<{
-    title?: string;
-    value?: string;
-    modelValue: boolean;
-    columns: Array<any>;
-    labelKey?: string;
-    valueKey?: string;
-  }>();
-  const title = ref(props.title);
-  const indicatorStyle = `height: 40px;`;
-  const emit = defineEmits(['updateValue', 'close', 'update:modelValue']);
-  const indexList = ref<number[]>([]);
-  let currentValue: string;
-  watch(
-    [() => props.modelValue, () => props.value],
-    () => {
-      if (props.modelValue) {
-        currentValue = props.value as string;
-        init();
-      }
-    },
-    {
-      immediate: true,
-    },
-  );
-  const init = () => {
-    const index = Math.max(
-      0,
-      props.columns.findIndex((item) => item[props.valueKey ?? 'value'] === currentValue),
-    );
-    indexList.value = [index];
-  };
-  const bindChange = useDebounceFn((e: any) => {
-    const val = e.detail.value;
-    nextTick(() => {
-      indexList.value = val;
-    });
-  }, 200);
-  init();
-  const submit = () => {
-    const val = indexList.value;
-    const newValue = props.columns[val[0]];
-    currentValue = newValue[props.valueKey ?? 'value'];
-    emit('updateValue', newValue);
-    emit('update:modelValue', false);
-    emit('close');
-  };
-  const closeHandler = () => {
-    emit('update:modelValue', false);
-    emit('close');
-  };
-  watch(
-    () => props.modelValue,
-    () => {
-      if (props.modelValue) {
-        init();
-      }
-    },
-  );
-</script>
-<style lang="scss" scoped>
-  .button-box {
-    display: flex;
-    justify-content: space-between;
-    font-size: 14px;
-    height: 58px;
-    text-align: center;
-    line-height: 36px;
-    margin: 10px 10px 0 10px;
-    &-left {
-      cursor: pointer;
-      height: 36px;
-      font-size: 16px;
-      color: #909193;
-    }
-    &-center {
-      height: 36px;
-      font-size: 16px;
-      color: #19242c;
-    }
-    &-right {
-      cursor: pointer;
-      height: 36px;
-      font-size: 16px;
-      color: #119af5;
-    }
-  }
-  .search-box {
-    padding: 12px 12px 0;
-    &-item {
-      margin: 6px;
-      overflow: hidden;
-      &-title {
-        height: 20px;
-        line-height: 20px;
-        font-size: 14px;
-        color: #333333;
-      }
-      .picker-view {
-        width: 100%;
-        height: 200px;
-        .flex-two {
-          flex: 2;
-        }
-      }
-      .item {
-        height: 40px;
-        line-height: 40px;
-        align-items: center;
-        justify-content: center;
-        text-align: center;
-      }
-    }
-  }
-</style>