uni-oaview 1.0.2 → 1.0.3

package/components/oa-skeleton/oa-skeleton.scss

@@ -30,6 +30,7 @@ $row-margin-top: 32rpx;
 .skeleton-row-item {
   background-color: $bg-color;
   height: $row-height;
+  margin: 0 auto;
 }
 .skeleton-row-item:not(:first-child) {
   margin-top: $row-margin-top;

package/components/oa-skeleton/oa-skeleton.vue

@@ -2,7 +2,11 @@
   <view>
     <!-- 为了解决H5中v-if导致样式失效的问题，故使用v-show -->
     <view v-show="loading">
-      <view class="skeleton" :class="{ animate: animate }">
+      <view
+        class="skeleton"
+        :style="{ 'padding-top': paddingTop, 'padding-bottom': paddingBottom }"
+        :class="{ animate: animate }"
+      >
         <view
           v-if="displayAvatar"
           class="skeleton-avatar"
@@ -16,7 +20,7 @@
               v-for="(item, index) in rowList"
               :key="index"
               class="skeleton-row-item"
-              :style="{ width: item.width, height: rowHeight }"
+              :style="{ 'width': item.width, 'height': rowHeight, 'border-radius': borderRadius }"
             ></view>
           </view>
         </view>
@@ -56,11 +60,31 @@
       type: String as PropType<'square' | 'round'>,
       default: '',
     },
+    rowWidth: {
+      type: String,
+      default: () => '100%',
+    },
+    lastRowWidth: {
+      type: String,
+      default: () => '100%',
+    },
+    borderRadius: {
+      type: String,
+      default: () => '0',
+    },
+    paddingTop: {
+      type: String,
+      default: () => '16rpx',
+    },
+    paddingBottom: {
+      type: String,
+      default: () => '16rpx',
+    },
   });
   const rowList = computed(() => {
     const arr: Array<any> = [];
     for (let i = 0; i < props.row; i++) {
-      arr.push({ width: i === props.row - 1 && i !== 0 ? DEFAULT_LAST_ROW_WIDTH : DEFAULT_ROW_WIDTH });
+      arr.push({ width: i === props.row - 1 && i !== 0 ? props.lastRowWidth : props.rowWidth });
     }
     return arr;
   });

package/components/oa-vconsole/oa-vconsole.vue

@@ -47,9 +47,14 @@
   import Storage from './storage.vue';
   import Console from './console.vue';
   import System from './system.vue';
-  const whiteUrls = ['http://192.168.12.175:6174', 'http://192.168.10.11:6174'];
+  const whiteUrls = [
+    'http://192.168.11.231:6174',
+    'http://192.168.10.11:6174',
+    'http://dev-oa.ge.cn:6174',
+    'http://test-oa.ge.cn:6174',
+  ];
   const show = ref(false);
-  const isShowDebugButton = ref(whiteUrls.includes(uni.getStorageSync('baseUrl')));
+  const isShowDebugButton = ref(whiteUrls.includes(uni.getStorageSync('baseUrl')) || !!uni.getStorageSync('isDebug'));
   const list = ref(['console', 'network', 'event', 'error', 'storage', 'system']);
   const current = ref(0);
   const openDebug = () => {

package/package.json

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

package/components/oa-skeleton/skeleton.scss

@@ -1,52 +0,0 @@
-$bg-color: white;
-$row-height: 32rpx;
-$row-margin-top: 32rpx;
-
-.skeleton {
-  display: flex;
-  padding: 32rpx;
-}
-.skeleton-avatar {
-  flex-shrink: 0;
-  background: $bg-color;
-  margin-right: 16rpx;
-}
-.skeleton-avatar.round {
-  border-radius: 50%;
-}
-
-.skeleton-content {
-  width: 100%;
-}
-
-.skeleton-title {
-  background-color: $bg-color;
-  height: $row-height;
-}
-
-.skeleton-title + .skeleton-rows {
-  margin-top: $row-margin-top;
-}
-.skeleton-row-item {
-  background-color: $bg-color;
-  height: $row-height;
-}
-.skeleton-row-item:not(:first-child) {
-  margin-top: $row-margin-top;
-}
-
-.skeleton.animate {
-  animation: skeleton-blink 1.2s ease-in-out infinite;
-}
-
-@keyframes skeleton-blink {
-  0% {
-    opacity: 1;
-  }
-  50% {
-    opacity: 0.6;
-  }
-  100% {
-    opacity: 1;
-  }
-}

package/components/oa-skeleton/skeleton.vue

@@ -1,104 +0,0 @@
-<template>
-  <view>
-    <!-- 为了解决H5中v-if导致样式失效的问题，故使用v-show -->
-    <view v-show="loading">
-      <view class="skeleton" :class="{ animate: animate }">
-        <view
-          v-if="displayAvatar"
-          class="skeleton-avatar"
-          :class="[displayAvatarShape]"
-          :style="{ width: displayAvatarSize, height: displayAvatarSize }"
-        ></view>
-        <view class="skeleton-content">
-          <view v-if="showTitle" class="skeleton-title" :style="{ width: titleWidth, height: rowHeight }"></view>
-          <view class="skeleton-rows">
-            <view
-              v-for="(item, index) in rowList"
-              :key="index"
-              class="skeleton-row-item"
-              :style="{ width: item.width, height: rowHeight }"
-            ></view>
-          </view>
-        </view>
-      </view>
-    </view>
-    <view v-show="!loading"><slot></slot></view>
-  </view>
-</template>
-
-<script lang="ts">
-  import { computed } from '@mk/composition-api';
-  import Vue from 'vue';
-
-  const DEFAULT_ROW_WIDTH = '100%';
-  const DEFAULT_LAST_ROW_WIDTH = '60%';
-
-  export default Vue.extend({
-    props: {
-      loading: {
-        type: Boolean,
-        default: false,
-      },
-      /** 是否展示图片 */
-      showAvatar: {
-        type: Boolean,
-        default: false,
-      },
-      /** 展示图片的尺寸 */
-      avatarSize: {
-        type: String,
-        default: '',
-      },
-      /** 图片的形状 */
-      avatarShape: {
-        type: String,
-        default: '', // square | round
-      },
-      /** 是否展示标题条 */
-      showTitle: {
-        type: Boolean,
-        default: false,
-      },
-      /** 标题条的宽度 */
-      titleWidth: {
-        type: String,
-        default: '40%',
-      },
-      /** 需要展示几行 */
-      row: {
-        type: Number,
-        default: 3,
-      },
-      /** 行高 */
-      rowHeight: {
-        type: String,
-        default: '32rpx',
-      },
-      /** 是否展示动画 */
-      animate: {
-        type: Boolean,
-        default: true,
-      },
-    },
-    setup(props: any) {
-      const rowList = computed(() => {
-        const arr: Array<any> = [];
-        for (let i = 0; i < props.row; i++) {
-          arr.push({ width: i === props.row - 1 && i !== 0 ? DEFAULT_LAST_ROW_WIDTH : DEFAULT_ROW_WIDTH });
-        }
-        return arr;
-      });
-      const displayAvatar = computed(() => props.avatarShape || props.showAvatar || props.avatarSize);
-      const displayAvatarShape = computed(() => props.avatarShape || 'round');
-      const displayAvatarSize = computed(() => props.avatarSize || '100rpx');
-      return {
-        rowList,
-        displayAvatar,
-        displayAvatarShape,
-        displayAvatarSize,
-      };
-    },
-  });
-</script>
-
-<style lang="scss" scoped src="./skeleton.scss"></style>