Browse Source

fix: 多余 props 删除 (#2023)

* fix: popover

* fix: 代码回退

* feat: 文档修改

* feat: 修改Imagepreview

* feat: imagepreview文案修改

* feat: noticebar文案修改

* fix: noticebar小程序不能运行问题修改

* feat: 组件文档修改picker

* docs: 文案修改

* docs: countdown

* feat: image

* docs: 文本修改

* fix: imagepreview

* docs: 单位修改

* docs: 文档修噶

* docs: actionsheet文档修改

* docs: 文档修改

* fix: drag使用公共函数

* docs: 文案更新

* feat: 文档修改

* feat: 文案修改

* feat: picker文案修改

* feat: picker

* feat: 文案修改

* fix: 多余Props删除
yangxiaolu1993 3 years ago
parent
commit
07ea99d5e5

+ 5 - 1
src/packages/__VUE/comment/components/CmtHeader.vue

@@ -47,7 +47,11 @@ export default create({
     },
     info: {
       type: Object,
-      default: () => ({})
+      default: () => {}
+    },
+    labels: {
+      type: Function,
+      default: () => ''
     }
   },
   emits: ['handleClick'],

+ 1 - 1
src/packages/__VUE/comment/index.taro.vue

@@ -13,7 +13,7 @@
       class="nut-comment__main"
       :style="`-webkit-line-clamp:${conEllipsis}`"
       @click="handleClick"
-      v-html="info.content.replace(/\n/g, '<br>')"
+      v-html="info.content"
     ></view>
 
     <comment-images :images="images" :videos="videos" :type="imagesRows" @clickImages="clickImages"></comment-images>

+ 1 - 1
src/packages/__VUE/comment/index.vue

@@ -13,7 +13,7 @@
       class="nut-comment__main"
       :style="`-webkit-line-clamp:${conEllipsis}`"
       @click="handleClick"
-      v-html="info.content.replace(/\n/g, '<br>')"
+      v-html="info.content"
     ></view>
 
     <comment-images :images="images" :videos="videos" :type="imagesRows" @clickImages="clickImages"></comment-images>

+ 1 - 2
src/packages/__VUE/pullrefresh/doc.en-US.md

@@ -47,7 +47,7 @@ The refresh event will be Emitted when pull refresh, you should set v-model to f
 :::
 ### Custom Tips
 
-The pull-down refresh has four states:`'loading' | 'loosing' | 'pulling' | 'complete'`,respectively corresponding to the attribute `pullingTxt、loosingTxt、loadingTxt` ,Complex styles can be implemented through slots。
+The pull-down refresh has four states:`'loading' | 'loosing' | 'pulling' `,respectively corresponding to the attribute `pullingTxt、loosingTxt、loadingTxt` ,Complex styles can be implemented through slots。
 
 :::demo
 
@@ -155,5 +155,4 @@ The trigger conditions for PullRefresh are: The parent position of the scroll ba
 | pulling  | Content of head when at pulling |
 | loosing  | Content of head when at loosing |
 | loading  | Content of head when at loading |
-| complete  | Content of head when at complete |
 | default  | 	Default slot |

+ 1 - 2
src/packages/__VUE/pullrefresh/doc.md

@@ -46,7 +46,7 @@ app.use(PullRefresh);
 :::
 ### 自定义文案
 
-下拉刷新有4个状态:`'loading' | 'loosing' | 'pulling' | 'complete'`,分别对应属性 `pullingTxt、loosingTxt、loadingTxt` ,复杂样式可以通过 slot 插槽实现。
+下拉刷新有4个状态:`'loading' | 'loosing' | 'pulling' `,分别对应属性 `pullingTxt、loosingTxt、loadingTxt` ,复杂样式可以通过 slot 插槽实现。
 
 :::demo
 
@@ -154,5 +154,4 @@ PullRefresh 的触发条件是:父级滚动元素的滚动条在顶部位置
 | pulling  | 下拉过程的顶部内容 |
 | loosing  | 释放过程中顶部内容 |
 | loading  | 加载过程中顶部内容 |
-| complete  | 加载完成顶部内容 |
 | default  | 自定义内容 |

+ 3 - 3
src/packages/__VUE/pullrefresh/index.vue

@@ -12,7 +12,7 @@
         <slot v-if="status == 'pulling'" name="pulling"></slot>
         <slot v-if="status == 'loosing'" name="loosing"></slot>
         <slot v-if="status == 'loading'" name="loading"></slot>
-        <slot v-if="status == 'complete'" name="complete"></slot>
+        <!-- <slot v-if="status == 'complete'" name="complete"></slot> -->
       </div>
       <slot></slot>
     </div>
@@ -102,8 +102,8 @@ export default create({
           return !slots.loosing ? props.loosingTxt : '';
         case 'loading':
           return !slots.loading ? props.loadingTxt : '';
-        case 'complete':
-          return !slots.complete ? props.completeTxt : '';
+        // case 'complete':
+        //   return !slots.complete ? props.completeTxt : '';
         default:
           break;
       }