@10yun/cv-mobile-ui 0.5.44 → 0.5.45

package/uview-plus/components/u-toolbar/style.css

@@ -1,29 +1,3 @@
-/* #ifndef APP-NVUE */
-.u-empty,
-.u-empty__wrap,
-.u-tabs,
-.u-tabs__wrapper,
-.u-tabs__wrapper__scroll-view-wrapper,
-.u-tabs__wrapper__scroll-view,
-.u-tabs__wrapper__nav,
-.u-tabs__wrapper__nav__line,
-.up-empty,
-.up-empty__wrap,
-.up-tabs,
-.up-tabs__wrapper,
-.up-tabs__wrapper__scroll-view-wrapper,
-.up-tabs__wrapper__scroll-view,
-.up-tabs__wrapper__nav,
-.up-tabs__wrapper__nav__line {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-/* #endif */
 .u-toolbar {
   height: 42px;
   /* #ifndef APP-NVUE */

package/uview-plus/components/u-toolbar/style.scss

@@ -1,5 +1,3 @@
-@import '../../libs/css/components.scss';
-
 .u-toolbar {
   height: 42px;
   @include flex;

package/uview-plus/components/u-toolbar/toolbar.js

@@ -7,12 +7,13 @@
  * @lastTime     : 2021-08-20 17:24:55
  * @FilePath     : /u-view2.0/uview-ui/libs/config/props/toolbar.js
  */
+import { t } from '../../libs/i18n'
 export default {
     // toolbar 组件
     toolbar: {
         show: true,
-        cancelText: '取消',
-        confirmText: '确认',
+        cancelText: t('up.common.cancel'),
+        confirmText: t('up.common.confirm'),
         cancelColor: '#909193',
         confirmColor: '',
         title: ''

package/uview-plus/components/u-toolbar/u-toolbar.vue

@@ -39,7 +39,7 @@ import { mixin } from '../../libs/mixin/mixin';
 /**
  * Toolbar 工具条
  * @description
- * @tutorial https://ijry.github.io/uview-plus/components/toolbar.html
+ * @tutorial https://uview-plus.jiangruyi.com/components/toolbar.html
  * @property {Boolean}	show			是否展示工具条（默认 true ）
  * @property {String}	cancelText		取消按钮的文字（默认 '取消' ）
  * @property {String}	confirmText		确认按钮的文字（默认 '确认' ）

package/uview-plus/components/u-tooltip/props.js

@@ -27,7 +27,12 @@ export const props = defineMixin({
       type: String,
       default: () => defProps.tooltip.bgColor
     },
-    // 弹出提示的方向，top-上方，bottom-下方
+    // 弹出提示框的背景色
+    popupBgColor: {
+      type: String,
+      default: () => defProps.tooltip.popupBgColor
+    },
+    // 弹出提示的方向，top-上方，bottom-下方，left-左方，right-右方
     direction: {
       type: String,
       default: () => defProps.tooltip.direction
@@ -56,6 +61,16 @@ export const props = defineMixin({
     showToast: {
       type: Boolean,
       default: () => defProps.tooltip.showToast
+    },
+    // 触发方式，可选值：longpress/click
+    triggerMode: {
+      type: String,
+      default: () => defProps.tooltip.triggerMode
+    },
+    // 强制定位
+    forcePosition: {
+      type: Object,
+      default: () => defProps.tooltip.forcePosition
     }
   }
 });

package/uview-plus/components/u-tooltip/style.css

@@ -1,29 +1,3 @@
-/* #ifndef APP-NVUE */
-.u-empty,
-.u-empty__wrap,
-.u-tabs,
-.u-tabs__wrapper,
-.u-tabs__wrapper__scroll-view-wrapper,
-.u-tabs__wrapper__scroll-view,
-.u-tabs__wrapper__nav,
-.u-tabs__wrapper__nav__line,
-.up-empty,
-.up-empty__wrap,
-.up-tabs,
-.up-tabs__wrapper,
-.up-tabs__wrapper__scroll-view-wrapper,
-.up-tabs__wrapper__scroll-view,
-.up-tabs__wrapper__nav,
-.up-tabs__wrapper__nav__line {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-/* #endif */
 .u-tooltip {
   position: relative;
   /* #ifndef APP-NVUE */
@@ -53,6 +27,7 @@
 }
 .u-tooltip__wrapper__popup__list {
   background-color: #060607;
+  color: #ffffff;
   position: relative;
   flex: 1;
   border-radius: 5px;

package/uview-plus/components/u-tooltip/style.scss

@@ -1,5 +1,3 @@
-@import '../../libs/css/components.scss';
-
 .u-tooltip {
   position: relative;
   @include flex;
@@ -21,6 +19,7 @@
 
       &__list {
         background-color: #060607;
+        color: #ffffff;
         position: relative;
         flex: 1;
         border-radius: 5px;

package/uview-plus/components/u-tooltip/tooltip.js

@@ -20,6 +20,9 @@ export default {
         showCopy: true,
         buttons: [],
         overlay: true,
-        showToast: true
+        showToast: true,
+        popupBgColor: '',
+        triggerMode: 'longpress',
+        forcePosition: {}
     }
 }

package/uview-plus/components/u-tooltip/u-tooltip.vue

@@ -6,29 +6,30 @@
       @click="overlayClickHandler"
     ></up-overlay>
     <view class="u-tooltip__wrapper">
-      <text
-        class="u-tooltip__wrapper__text"
-        :id="textId"
-        :ref="textId"
-        :userSelect="false"
-        :selectable="false"
-        @longpress.stop="longpressHandler"
-        :style="{
-          color: color,
-          backgroundColor: bgColor && showTooltip && tooltipTop !== -10000 ? bgColor : 'transparent'
-        }"
-      >
-        {{ text }}
-      </text>
+      <view class="u-tooltip__trigger" :id="textId" :ref="textId" @click.stop="clickHander" @longpress.stop="longpressHandler">
+        <slot name="trigger"></slot>
+        <text
+          v-if="!$slots['trigger']"
+          class="u-tooltip__wrapper__text"
+          :userSelect="false"
+          :selectable="false"
+          :style="{
+            color: color,
+            backgroundColor: bgColor && showTooltip && tooltipTop !== -10000 ? bgColor : 'transparent'
+          }"
+        >
+          {{ text }}
+        </text>
+      </view>
       <up-transition
         mode="fade"
         :show="showTooltip"
         duration="300"
         :customStyle="{
           position: 'absolute',
-          top: addUnit(tooltipTop),
+          top: addUnit(tooltipTop, 'px'),
           zIndex: zIndex,
-          ...tooltipStyle
+          ...tooltipStyleCpu
         }"
       >
         <view class="u-tooltip__wrapper__popup" :id="tooltipId" :ref="tooltipId">
@@ -40,28 +41,39 @@
               indicatorStyle,
               {
                 width: addUnit(indicatorWidth),
-                height: addUnit(indicatorWidth)
+                height: addUnit(indicatorWidth),
+                backgroundColor: popupBgColor
               }
             ]"
           >
             <!-- 由于nvue不支持三角形绘制，这里就做一个四方形，再旋转45deg，得到露出的一个三角 -->
           </view>
-          <view class="u-tooltip__wrapper__popup__list">
-            <view
-              v-if="showCopy"
-              class="u-tooltip__wrapper__popup__list__btn"
-              hover-class="u-tooltip__wrapper__popup__list__btn--hover"
-              @tap="setClipboardData"
-            >
-              <text class="u-tooltip__wrapper__popup__list__btn__text">复制</text>
-            </view>
-            <up-line direction="column" color="#8d8e90" v-if="showCopy && buttons.length > 0" length="18"></up-line>
-            <block v-for="(item, index) in buttons" :key="index">
-              <view class="u-tooltip__wrapper__popup__list__btn" hover-class="u-tooltip__wrapper__popup__list__btn--hover">
-                <text class="u-tooltip__wrapper__popup__list__btn__text" @tap="btnClickHandler(index)">{{ item }}</text>
+          <view
+            class="u-tooltip__wrapper__popup__list"
+            :style="{
+              backgroundColor: popupBgColor,
+              color: color
+            }"
+          >
+            <slot name="content"></slot>
+            <template v-if="!$slots['content']">
+              <view
+                v-if="showCopy"
+                class="u-tooltip__wrapper__popup__list__btn"
+                hover-class="u-tooltip__wrapper__popup__list__btn--hover"
+                :style="{ backgroundColor: popupBgColor }"
+                @tap="setClipboardData"
+              >
+                <text class="u-tooltip__wrapper__popup__list__btn__text">复制</text>
               </view>
-              <up-line direction="column" color="#8d8e90" v-if="index < buttons.length - 1" length="18"></up-line>
-            </block>
+              <up-line direction="column" color="#8d8e90" v-if="showCopy && buttons.length > 0" length="18"></up-line>
+              <block v-for="(item, index) in buttons" :key="index">
+                <view class="u-tooltip__wrapper__popup__list__btn" hover-class="u-tooltip__wrapper__popup__list__btn--hover">
+                  <text class="u-tooltip__wrapper__popup__list__btn__text" @tap="btnClickHandler(index)">{{ item }}</text>
+                </view>
+                <up-line direction="column" color="#8d8e90" v-if="index < buttons.length - 1" length="18"></up-line>
+              </block>
+            </template>
           </view>
         </view>
       </up-transition>
@@ -79,18 +91,19 @@ const dom = uni.requireNativePlugin('dom');
 /**
  * Tooltip
  * @description
- * @tutorial https://ijry.github.io/uview-plus/components/tooltip.html
- * @property {String | Number}	text		需要显示的提示文字
- * @property {String | Number}	copyText	点击复制按钮时，复制的文本，为空则使用text值
- * @property {String | Number}	size		文本大小（默认 14 ）
- * @property {String}			color		字体颜色（默认 '#606266' ）
- * @property {String}			bgColor		弹出提示框时，文本的背景色（默认 'transparent' ）
- * @property {String}			direction	弹出提示的方向，top-上方，bottom-下方（默认 'top' ）
- * @property {String | Number}	zIndex		弹出提示的z-index，nvue无效（默认 10071 ）
- * @property {Boolean}			showCopy	是否显示复制按钮（默认 true ）
- * @property {Array}			buttons		扩展的按钮组
- * @property {Boolean}			overlay		是否显示透明遮罩以防止触摸穿透（默认 true ）
- * @property {Object}			customStyle	定义需要用到的外部样式
+ * @tutorial https://uview-plus.jiangruyi.com/components/tooltip.html
+ * @property {String | Number}	text		 需要显示的提示文字
+ * @property {String | Number}	copyText	 点击复制按钮时，复制的文本，为空则使用text值
+ * @property {String | Number}	size		 文本大小（默认 14 ）
+ * @property {String}			color		 字体颜色（默认 '#606266' ）
+ * @property {String}			bgColor		 弹出提示框时，文本的背景色（默认 'transparent' ）
+ * @property {String}			popupBgColor 弹出提示框的背景色
+ * @property {String}			direction	 弹出提示的方向，top-上方，bottom-下方（默认 'top' ）
+ * @property {String | Number}	zIndex		 弹出提示的z-index，nvue无效（默认 10071 ）
+ * @property {Boolean}			showCopy	 是否显示复制按钮（默认 true ）
+ * @property {Array}			buttons		 扩展的按钮组
+ * @property {Boolean}			overlay		 是否显示透明遮罩以防止触摸穿透（默认 true ）
+ * @property {Object}			customStyle	 定义需要用到的外部样式
  *
  * @event {Function}
  * @example
@@ -113,7 +126,7 @@ export default {
         left: 0
       },
       // 文本的位置信息
-      textInfo: {
+      triggerInfo: {
         width: 0,
         left: 0
       },
@@ -122,12 +135,15 @@ export default {
       // 气泡在可能超出屏幕边沿范围时，重新定位后，距离屏幕边沿的距离
       screenGap: 12,
       // 三角形指示器的宽高，由于对元素进行了角度旋转，精确计算指示器位置时，需要用到其尺寸信息
-      indicatorWidth: 14
+      indicatorWidth: 14,
+      tooltipStyle: {},
+      calcReacted: false
     };
   },
   watch: {
-    propsChange() {
-      this.getElRect();
+    async propsChange() {
+      await this.getElRect();
+      // this.getTooltipStyle();
     }
   },
   computed: {
@@ -137,35 +153,59 @@ export default {
       return [this.text, this.buttons];
     },
     // 计算气泡和指示器的位置信息
-    tooltipStyle() {
-      const style = {
-          transform: `translateY(${this.direction === 'top' ? '-100%' : '100%'})`
-        },
+    tooltipStyleCpu() {
+      if (!this.calcReacted) {
+        return {};
+      }
+      const style = {},
         sysInfo = getWindowInfo();
-      if (this.tooltipInfo.width / 2 > this.textInfo.left + this.textInfo.width / 2 - this.screenGap) {
-        this.indicatorStyle = {};
-        style.left = `-${addUnit(this.textInfo.left - this.screenGap)}`;
-        this.indicatorStyle.left = addUnit(this.textInfo.width / 2 - getPx(style.left) - this.indicatorWidth / 2);
-      } else if (
-        this.tooltipInfo.width / 2 >
-        sysInfo.windowWidth - this.textInfo.right + this.textInfo.width / 2 - this.screenGap
-      ) {
+      if (this.direction === 'left') {
+        // 右侧显示逻辑
+        style.transform = ``;
+        // 垂直居中对齐
+        style.top = '-' + addUnit((this.triggerInfo.height - this.tooltipInfo.height) / 2, 'px');
+        style.right = addUnit(this.triggerInfo.width + this.indicatorWidth, 'px');
         this.indicatorStyle = {};
-        style.right = `-${addUnit(sysInfo.windowWidth - this.textInfo.right - this.screenGap)}`;
-        this.indicatorStyle.right = addUnit(this.textInfo.width / 2 - getPx(style.right) - this.indicatorWidth / 2);
-      } else {
-        const left = Math.abs(this.textInfo.width / 2 - this.tooltipInfo.width / 2);
-        style.left = this.textInfo.width > this.tooltipInfo.width ? addUnit(left) : -addUnit(left);
+        this.indicatorStyle.right = '-4px';
+        this.indicatorStyle.top = addUnit((this.tooltipInfo.height - this.indicatorWidth) / 2, 'px');
+      } else if (this.direction === 'right') {
+        // 右侧显示逻辑
+        style.transform = ``;
+        // 垂直居中对齐
+        style.top = '-' + addUnit((this.triggerInfo.height - this.tooltipInfo.height) / 2, 'px');
+        style.left = addUnit(this.triggerInfo.width + this.indicatorWidth, 'px');
         this.indicatorStyle = {};
+        this.indicatorStyle.left = '-4px';
+        this.indicatorStyle.top = addUnit((this.triggerInfo.height - this.indicatorWidth) / 2, 'px');
+      } else if (this.direction === 'top' || this.direction === 'bottom') {
+        style.transform = `translateY(${this.direction === 'top' ? '-100%' : '100%'})`;
+        if (this.tooltipInfo.width / 2 > this.triggerInfo.left + this.triggerInfo.width / 2 - this.screenGap) {
+          this.indicatorStyle = {};
+          style.left = `-${addUnit(this.triggerInfo.left - this.screenGap)}`;
+          this.indicatorStyle.left = addUnit(this.triggerInfo.width / 2 - getPx(style.left) - this.indicatorWidth / 2, 'px');
+        } else if (
+          this.tooltipInfo.width / 2 >
+          sysInfo.windowWidth - this.triggerInfo.right + this.triggerInfo.width / 2 - this.screenGap
+        ) {
+          this.indicatorStyle = {};
+          style.right = `-${addUnit(sysInfo.windowWidth - this.triggerInfo.right - this.screenGap)}`;
+          this.indicatorStyle.right = addUnit(this.triggerInfo.width / 2 - getPx(style.right) - this.indicatorWidth / 2);
+        } else {
+          const left = Math.abs(this.triggerInfo.width / 2 - this.tooltipInfo.width / 2);
+          style.left = this.triggerInfo.width > this.tooltipInfo.width ? addUnit(left) : -addUnit(left);
+          this.indicatorStyle = {};
+        }
+        if (this.direction === 'top') {
+          style.marginTop = '-10px';
+          this.indicatorStyle.bottom = '-4px';
+        } else {
+          style.marginBottom = '-10px';
+          this.indicatorStyle.top = '-4px';
+        }
       }
-      if (this.direction === 'top') {
-        style.marginTop = '-10px';
-        this.indicatorStyle.bottom = '-4px';
-      } else {
-        style.marginBottom = '-10px';
-        this.indicatorStyle.top = '-4px';
-      }
-      return style;
+      let styleMerge = { ...style, ...this.forcePosition };
+      this.tooltipStyle = styleMerge;
+      return styleMerge;
     }
   },
   mounted() {
@@ -175,13 +215,25 @@ export default {
   methods: {
     addStyle,
     addUnit,
-    init() {
-      this.getElRect();
+    async init() {
+      await this.getElRect();
+      // this.getTooltipStyle();
+    },
+    // 点击触发事件
+    async clickHander() {
+      // this.getTooltipStyle();
+      if (this.triggerMode == 'click') {
+        this.tooltipTop = 0;
+        this.showTooltip = true;
+      }
     },
     // 长按触发事件
     async longpressHandler() {
-      this.tooltipTop = 0;
-      this.showTooltip = true;
+      // this.getTooltipStyle();
+      if (this.triggerMode == 'longpress') {
+        this.tooltipTop = 0;
+        this.showTooltip = true;
+      }
     },
     // 点击透明遮罩
     overlayClickHandler() {
@@ -196,7 +248,7 @@ export default {
     // 查询内容高度
     queryRect(ref) {
       // #ifndef APP-NVUE
-      // $uGetRect为uView自带的节点查询简化方法，详见文档介绍：https://ijry.github.io/uview-plus/js/getRect.html
+      // $uGetRect为uview-plus自带的节点查询简化方法，详见文档介绍：https://uview-plus.jiangruyi.com/js/getRect.html
       // 组件内部一般用this.$uGetRect，对外的为uni.$u.getRect，二者功能一致，名称不同
       return new Promise((resolve) => {
         this.$uGetRect(`#${ref}`).then((size) => {
@@ -216,17 +268,19 @@ export default {
     },
     // 元素尺寸
     getElRect() {
-      // 调用之前，先将指示器调整到屏幕外，方便获取尺寸
-      this.showTooltip = true;
-      this.tooltipTop = -10000;
-      sleep(500).then(() => {
-        this.queryRect(this.tooltipId).then((size) => {
-          this.tooltipInfo = size;
+      return new Promise(async (resolve) => {
+        // 调用之前，先将指示器调整到屏幕外，方便获取尺寸
+        this.showTooltip = true;
+        this.tooltipTop = -10000;
+        sleep(500).then(async () => {
+          this.tooltipInfo = await this.queryRect(this.tooltipId);
           // 获取气泡尺寸之后，将其隐藏，为了让下次切换气泡显示与隐藏时，有淡入淡出的效果
           this.showTooltip = false;
-        });
-        this.queryRect(this.textId).then((size) => {
-          this.textInfo = size;
+          this.triggerInfo = await this.queryRect(this.textId);
+          sleep(500).then(() => {
+            this.calcReacted = true;
+          });
+          resolve();
         });
       });
     },

package/uview-plus/components/u-tr/style.css

@@ -1,26 +1,6 @@
-/* #ifndef APP-NVUE */
-.u-empty,
-.u-empty__wrap,
-.u-tabs,
-.u-tabs__wrapper,
-.u-tabs__wrapper__scroll-view-wrapper,
-.u-tabs__wrapper__scroll-view,
-.u-tabs__wrapper__nav,
-.u-tabs__wrapper__nav__line,
-.up-empty,
-.up-empty__wrap,
-.up-tabs,
-.up-tabs__wrapper,
-.up-tabs__wrapper__scroll-view-wrapper,
-.up-tabs__wrapper__scroll-view,
-.up-tabs__wrapper__nav,
-.up-tabs__wrapper__nav__line {
+.u-tr {
+  /* #ifndef APP-NVUE */
   display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-/* #endif */
+  /* #endif */
+  flex-direction: row;
+}

package/uview-plus/components/u-tr/style.scss

@@ -1 +1,3 @@
-@import '../../libs/css/components.scss';
+.u-tr {
+  @include flex;
+}

package/uview-plus/components/u-tr/u-tr.vue

@@ -1,5 +1,7 @@
 <template>
-  <view class="u-tr"></view>
+  <view class="u-tr">
+    <slot></slot>
+  </view>
 </template>
 <script>
 import { props } from './props';

package/uview-plus/components/u-transition/_doc/readme.md

@@ -4,7 +4,7 @@
 
 该组件用于组件的动画过渡效果。
 
-## [查看文档](https://ijry.github.io/uview-plus/components/transition.html)
+## [查看文档](https://uview-plus.jiangruyi.com/components/transition.html)
 
 ## [更多组件, 请查看 `u-ui` 组件库](https://ext.dcloud.net.cn/plugin?name=u--ui)
 (请勿下载插件zip)
@@ -13,4 +13,4 @@
 	<img src="https://wuui.cn/intr.png">
 </a>
 
-**如使用过程中有任何问题，或者您对u-ui有一些好的建议。<br>欢迎加入 [u-ui 交流群](https://ijry.github.io/uview-plus/components/qqFeedBack.html)**
+**如使用过程中有任何问题，或者您对u-ui有一些好的建议。<br>欢迎加入 [u-ui 交流群](https://uview-plus.jiangruyi.com/components/qqFeedBack.html)**

package/uview-plus/components/u-transition/style.css

@@ -1,31 +1,5 @@
 @charset "UTF-8";
 /* #ifndef APP-NVUE */
-.u-empty,
-.u-empty__wrap,
-.u-tabs,
-.u-tabs__wrapper,
-.u-tabs__wrapper__scroll-view-wrapper,
-.u-tabs__wrapper__scroll-view,
-.u-tabs__wrapper__nav,
-.u-tabs__wrapper__nav__line,
-.up-empty,
-.up-empty__wrap,
-.up-tabs,
-.up-tabs__wrapper,
-.up-tabs__wrapper__scroll-view-wrapper,
-.up-tabs__wrapper__scroll-view,
-.up-tabs__wrapper__nav,
-.up-tabs__wrapper__nav__line {
-  display: flex;
-  flex-direction: column;
-  flex-shrink: 0;
-  flex-grow: 0;
-  flex-basis: auto;
-  align-items: stretch;
-  align-content: flex-start;
-}
-/* #endif */
-/* #ifndef APP-NVUE */
 /**
  * vue版本动画内置的动画模式有如下：
  * fade：淡入