@vtj/materials 0.10.5 → 0.10.7

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@vtj/materials",
   "private": false,
-  "version": "0.10.5",
+  "version": "0.10.7",
   "type": "module",
   "devDependencies": {
     "@dcloudio/uni-app": "3.0.0-4040520250104002",
     "@dcloudio/uni-h5": "3.0.0-4040520250104002",
     "@dcloudio/uni-h5-vue": "3.0.0-4040520250104002",
     "@dcloudio/uni-ui": "~1.5.3",
-    "@vueuse/core": "~12.5.0",
+    "@vueuse/core": "~12.7.0",
     "ant-design-vue": "~4.2.0",
     "echarts": "~5.6.0",
     "element-plus": "~2.9.1",
     "vant": "~4.9.10",
     "vue": "~3.5.5",
     "vue-router": "~4.5.0",
-    "@vtj/cli": "~0.10.1",
-    "@vtj/charts": "~0.10.5",
-    "@vtj/core": "~0.10.5",
-    "@vtj/ui": "~0.10.5",
-    "@vtj/utils": "~0.10.5"
+    "@vtj/charts": "~0.10.7",
+    "@vtj/cli": "~0.10.2",
+    "@vtj/core": "~0.10.7",
+    "@vtj/ui": "~0.10.7",
+    "@vtj/utils": "~0.10.7"
   },
   "files": [
     "dist",

package/src/uni-h5/components/input.ts

@@ -6,7 +6,7 @@ const desc: MaterialDescription = {
   categoryId: 'form',
   props: [
     {
-      name: 'value',
+      name: 'modelValue',
       title: '输入框的初始内容',
       setters: 'StringSetter'
     },
@@ -209,7 +209,7 @@ const desc: MaterialDescription = {
       ]
     }
   ],
-  events: ['input', 'focus', 'blur', 'confirm'],
+  events: ['input', 'focus', 'blur', 'confirm', 'update:modelValue'],
   snippet: {
     props: {
       placeholder: '这个是一个输入框'

package/src/uni-h5/components/scrollView.ts

@@ -124,7 +124,7 @@ const desc: MaterialDescription = {
     },
     children: [
       {
-        name: 'view',
+        name: 'View',
         props: {
           id: 'demo1',
           class: 'scroll-view-item uni-bg-red',
@@ -133,7 +133,7 @@ const desc: MaterialDescription = {
         children: 'A'
       },
       {
-        name: 'view',
+        name: 'View',
         props: {
           id: 'demo2',
           class: 'scroll-view-item uni-bg-green',
@@ -142,7 +142,7 @@ const desc: MaterialDescription = {
         children: 'B'
       },
       {
-        name: 'view',
+        name: 'View',
         props: {
           id: 'demo3',
           class: 'scroll-view-item uni-bg-blue',

package/src/uni-h5/components/video.ts

@@ -257,7 +257,7 @@ const desc: MaterialDescription = {
       'enable-danmu': true,
       'danmu-btn': true,
       controls: true,
-      danmuList: [
+      'danmu-list': [
         {
           text: '第 1s 出现的弹幕',
           color: '#ff0000',

package/src/uni-ui/components/badge.ts

@@ -65,11 +65,7 @@ const desc: MaterialDescription = {
   events: ['click'],
   snippet: {
     props: {
-      text: '1',
-      style: {
-        width: '20px',
-        height: '20px'
-      }
+      text: '1'
     }
   }
 };

package/src/uni-ui/components/breadcrumb.ts

@@ -25,26 +25,7 @@ const desc: MaterialDescription[] = [
       children: [
         {
           name: 'UniBreadcrumbItem',
-          props: {
-            to: {
-              type: 'JSExpression',
-              value: 'this.context.item.to'
-            }
-          },
-          children: {
-            type: 'JSExpression',
-            value: 'this.context.item.name'
-          },
-          directives: [
-            {
-              name: 'vFor',
-              value: {
-                type: 'JSExpression',
-                value:
-                  '[{to: "/pages/index/index",name: "首页"},{	to: "",name: "菜单 A",},{to: "",name: "菜单 B"}]'
-              }
-            }
-          ]
+          children: '首页'
         }
       ]
     }

package/src/uni-ui/components/collapse.ts

@@ -22,22 +22,30 @@ const desc: MaterialDescription[] = [
     events: ['change', 'update:modelValue'],
     snippet: {
       props: {
-        accordion: true
+        modelValue: ['0']
       },
       children: [
         {
           name: 'UniCollapseItem',
-          props: { title: '手风琴效果' },
-          children: [{ name: 'Text', children: '折叠内容' }]
-          // directives: [
-          //   {
-          //     name: 'vFor',
-          //     value: {
-          //       type: 'JSExpression',
-          //       value: '4'
-          //     }
-          //   }
-          // ]
+          props: { title: '默认开启"' },
+          children: [
+            {
+              name: 'Text',
+              children:
+                '折叠内容主体，这是一段比较长内容。默认折叠主要内容，只显示当前项标题。点击标题展开，才能看到这段文字。再次点击标题，折叠内容。'
+            }
+          ]
+        },
+        {
+          name: 'UniCollapseItem',
+          props: { title: '折叠内容' },
+          children: [
+            {
+              name: 'Text',
+              children:
+                '折叠内容主体，这是一段比较长内容。默认折叠主要内容，只显示当前项标题。点击标题展开，才能看到这段文字。再次点击标题，折叠内容。'
+            }
+          ]
         }
       ]
     }
@@ -100,17 +108,8 @@ const desc: MaterialDescription[] = [
     ],
     slots: ['default', 'title'],
     snippet: {
-      props: { title: '手风琴效果' },
-      children: [{ name: 'Text', children: '折叠内容' }],
-      directives: [
-        {
-          name: 'vFor',
-          value: {
-            type: 'JSExpression',
-            value: '2'
-          }
-        }
-      ]
+      props: { title: '基本使用' },
+      children: [{ name: 'Text', children: '折叠内容' }]
     }
   }
 ];

package/src/uni-ui/components/grid.ts

@@ -57,15 +57,6 @@ const desc: MaterialDescription[] = [
                 { name: 'Text', children: '文本信息' }
               ]
             }
-          ],
-          directives: [
-            {
-              name: 'vFor',
-              value: {
-                type: 'JSExpression',
-                value: '4'
-              }
-            }
           ]
         }
       ]

package/src/uni-ui/components/group.ts

@@ -32,16 +32,7 @@ const desc: MaterialDescription = {
     children: [
       {
         name: 'View',
-        children: ' 分组内容 ',
-        directives: [
-          {
-            name: 'vFor',
-            value: {
-              type: 'JSExpression',
-              value: '4'
-            }
-          }
-        ]
+        children: ' 分组内容 '
       }
     ]
   }

package/src/uni-ui/components/index.ts

@@ -42,8 +42,8 @@ import searchBar from './searchBar';
 import section from './section';
 import segmentedControl from './segmentedControl';
 import steps from './steps';
-import swipeAction from './swipeAction';
-import swiperDot from './swiperDot';
+// import swipeAction from './swipeAction';
+// import swiperDot from './swiperDot';
 import table from './table';
 import tag from './tag';
 import title from './title';
@@ -89,8 +89,8 @@ const components: MaterialDescription[] = [
   section,
   segmentedControl,
   steps,
-  swipeAction,
-  swiperDot,
+  // swipeAction,
+  // swiperDot,
   table,
   tag,
   title,

package/src/uni-ui/components/popup.ts

@@ -66,7 +66,9 @@ const desc: MaterialDescription[] = [
       }
     ],
     events: ['change', 'maskClick'],
-    snippet: {}
+    snippet: {
+      children: [{ name: 'View', children: 'popup 内容' }]
+    }
   },
   {
     name: 'UniPopupMessage',
@@ -95,7 +97,13 @@ const desc: MaterialDescription[] = [
       }
     ],
     slots: ['default'],
-    snippet: {}
+    snippet: {
+      props: {
+        type: 'success',
+        message: '这是一条成功提示',
+        duration: '2000'
+      }
+    }
   },
   {
     name: 'UniPopupDialog',

package/src/uni-ui/components/swiperDot.ts

@@ -94,14 +94,28 @@ const desc: MaterialDescription = {
                   }
                 ]
               }
-            ],
-            directives: [
+            ]
+          },
+          {
+            name: 'SwiperItem',
+            children: [
               {
-                name: 'vFor',
-                value: {
-                  type: 'JSExpression',
-                  value: '4'
-                }
+                name: 'View',
+                children: [
+                  {
+                    name: 'Text',
+                    props: {
+                      style: {
+                        color: '#fff',
+                        fontSize: '32px'
+                      }
+                    },
+                    children: {
+                      type: 'JSExpression',
+                      value: 'this.context.item.name'
+                    }
+                  }
+                ]
               }
             ]
           }

package/src/uni-ui/components/table.ts

@@ -71,7 +71,9 @@ const desc: MaterialDescription[] = [
     childIncludes: ['UniTh', 'UniTd'],
     categoryId: 'ext',
     props: [],
-    snippet: {}
+    snippet: {
+      children: 'tr'
+    }
   },
   {
     name: 'UniTh',
@@ -110,7 +112,9 @@ const desc: MaterialDescription[] = [
       }
     ],
     events: ['sort-change', 'filter-change'],
-    snippet: {}
+    snippet: {
+      children: 'th'
+    }
   },
   {
     name: 'UniTd',
@@ -125,7 +129,9 @@ const desc: MaterialDescription[] = [
         options: ['left', 'center', 'right']
       }
     ],
-    snippet: {}
+    snippet: {
+      children: 'td'
+    }
   }
 ];
 

package/src/uni-ui/components/transition.ts

@@ -15,7 +15,16 @@ const desc: MaterialDescription = {
       name: 'mode-class',
       title: '内置过渡动画类型',
       defaultValue: '',
-      setters: ['ArraySetter', 'StringSetter']
+      setters: ['SelectSetter', 'ArraySetter', 'StringSetter'],
+      options: [
+        'fade',
+        'slide-top',
+        'slide-right',
+        'slide-bottom',
+        'slide-left',
+        'zoom-in',
+        'zoom-out'
+      ]
     },
     {
       name: 'custom-class',

package/src/uni-ui/index.ts

@@ -7,89 +7,64 @@ import UniBreadcrumb from '@dcloudio/uni-ui/lib/uni-breadcrumb/uni-breadcrumb.vu
 import UniBreadcrumbItem from '@dcloudio/uni-ui/lib/uni-breadcrumb-item/uni-breadcrumb-item.vue';
 import UniCalendar from '@dcloudio/uni-ui/lib/uni-calendar/uni-calendar.vue';
 import UniCard from '@dcloudio/uni-ui/lib/uni-card/uni-card.vue';
-import UniCollapse from '@dcloudio/uni-ui/lib/uni-collapse/uni-collapse.vue';
-import UniCollapseItem from '@dcloudio/uni-ui/lib/uni-collapse-item/uni-collapse-item.vue';
+import UniCollapse from './lib/uni-collapse/uni-collapse.vue';
+import UniCollapseItem from './lib/uni-collapse-item/uni-collapse-item.vue';
 import UniCombox from '@dcloudio/uni-ui/lib/uni-combox/uni-combox.vue';
 import UniCountdown from '@dcloudio/uni-ui/lib/uni-countdown/uni-countdown.vue';
 import UniDataCheckbox from '@dcloudio/uni-ui/lib/uni-data-checkbox/uni-data-checkbox.vue';
-import UniDataPicker from '@dcloudio/uni-ui/lib/uni-data-picker/uni-data-picker.vue';
-import UniDataPickerview from '@dcloudio/uni-ui/lib/uni-data-pickerview/uni-data-pickerview.vue';
-// import UniDataSelect from '@dcloudio/uni-ui/lib/uni-data-select/uni-data-select.vue';
+import UniDataPicker from './lib/uni-data-picker/uni-data-picker.vue';
+import UniDataPickerview from './lib/uni-data-pickerview/uni-data-pickerview.vue';
 import UniDataSelect from './lib/uni-data-select/uni-data-select.vue';
 import UniDateformat from '@dcloudio/uni-ui/lib/uni-dateformat/uni-dateformat.vue';
-//? 编译器 原因： 声明了变量多次。第618-620行。
-// import UniDatetimePicker from '@dcloudio/uni-ui/lib/uni-datetime-picker/uni-datetime-picker.vue';
 import UniDatetimePicker from './lib/uni-datetime-picker/uni-datetime-picker.vue';
-//? css 参数。 $uni-bg-color异常。 scss 问题 处理不了 $ 变量
 import UniDrawer from '@dcloudio/uni-ui/lib/uni-drawer/uni-drawer.vue';
-//? 条件编译 出现两个组件
-// import UniEasyinput from '@dcloudio/uni-ui/lib/uni-easyinput/uni-easyinput.vue';
 import UniEasyinput from './lib/uni-easyinput/uni-easyinput.vue';
-import UniFob from '@dcloudio/uni-ui/lib/uni-fab/uni-fab.vue';
-import UniFov from '@dcloudio/uni-ui/lib/uni-fav/uni-fav.vue';
-import UniFilePicker from '@dcloudio/uni-ui/lib/uni-file-picker/uni-file-picker.vue';
+import UniFab from '@dcloudio/uni-ui/lib/uni-fab/uni-fab.vue';
+import UniFav from './lib/uni-fav/uni-fav.vue';
+import UniFilePicker from './lib/uni-file-picker/uni-file-picker.vue';
 import UniForms from './lib/uni-forms/uni-forms.vue';
-//? 条件编译 出现两个组件
-// import UniFormsItem from '@dcloudio/uni-ui/lib/uni-forms-item/uni-forms-item.vue';
 import UniFormsItem from './lib/uni-forms-item/uni-forms-item.vue';
 import UniGoodsNav from '@dcloudio/uni-ui/lib/uni-goods-nav/uni-goods-nav.vue';
-import UniGrid from '@dcloudio/uni-ui/lib/uni-grid/uni-grid.vue';
+import UniGrid from './lib/uni-grid/uni-grid.vue';
 import UniGridItem from '@dcloudio/uni-ui/lib/uni-grid-item/uni-grid-item.vue';
 import UniGroup from '@dcloudio/uni-ui/lib/uni-group/uni-group.vue';
-// import UniIcons from '@dcloudio/uni-ui/lib/uni-icons/uni-icons.vue';
 import UniIcons from './lib/uni-icons/uni-icons.vue';
-//? css 参数。 scss 问题  处理不了 $ 变量
-// import UniIndexedList from '@dcloudio/uni-ui/lib/uni-indexed-list/uni-indexed-list.vue';
 import UniIndexedList from './lib/uni-indexed-list/uni-indexed-list.vue';
 import UniLink from '@dcloudio/uni-ui/lib/uni-link/uni-link.vue';
-// import UniList from '@dcloudio/uni-ui/lib/uni-list/uni-list.vue';
 import UniList from './lib/uni-list/uni-list.vue';
 import UniListItem from '@dcloudio/uni-ui/lib/uni-list-item/uni-list-item.vue';
 import UniListChat from '@dcloudio/uni-ui/lib/uni-list-chat/uni-list-chat.vue';
-//? css 参数。。 scss 问题 处理不了 $ 变量
 import UniListAd from '@dcloudio/uni-ui/lib/uni-list-ad/uni-list-ad.vue';
-import UniLoadMore from '@dcloudio/uni-ui/lib/uni-load-more/uni-load-more.vue';
+import UniLoadMore from './lib/uni-load-more/uni-load-more.vue';
 import UniNavBar from '@dcloudio/uni-ui/lib/uni-nav-bar/uni-nav-bar.vue';
-import UniNoticeBar from '@dcloudio/uni-ui/lib/uni-notice-bar/uni-notice-bar.vue';
+import UniNoticeBar from './lib/uni-notice-bar/uni-notice-bar.vue';
 import UniNumberBox from '@dcloudio/uni-ui/lib/uni-number-box/uni-number-box.vue';
 import UniPagination from '@dcloudio/uni-ui/lib/uni-pagination/uni-pagination.vue';
-//? 编译器 原因： 声明了变量多次。 第228-235行
-// import UniPopup from '@dcloudio/uni-ui/lib/uni-popup/uni-popup.vue';
 import UniPopup from './lib/uni-popup/uni-popup.vue';
-import UniPopupMessage from '@dcloudio/uni-ui/lib/uni-popup-message/uni-popup-message.vue';
+import UniPopupMessage from './lib/uni-popup-message/uni-popup-message.vue';
+import UniPopupDialog from './lib/uni-popup-dialog/uni-popup-dialog.vue';
 import UniPopupShare from '@dcloudio/uni-ui/lib/uni-popup-share/uni-popup-share.vue';
-// import UniRate from '@dcloudio/uni-ui/lib/uni-rate/uni-rate.vue';
 import UniRate from './lib/uni-rate/uni-rate.vue';
-import UniRow from '@dcloudio/uni-ui/lib/uni-row/uni-row.vue';
-// import UniCol from '@dcloudio/uni-ui/lib/uni-col/uni-col.vue';
+import UniRow from './lib/uni-row/uni-row.vue';
 import UniCol from './lib/uni-col/uni-col.vue';
-import UniSearchBar from '@dcloudio/uni-ui/lib/uni-search-bar/uni-search-bar.vue';
+import UniSearchBar from './lib/uni-search-bar/uni-search-bar.vue';
 import UniSection from '@dcloudio/uni-ui/lib/uni-section/uni-section.vue';
 import UniSegmentedControl from '@dcloudio/uni-ui/lib/uni-segmented-control/uni-segmented-control.vue';
 import UniSteps from '@dcloudio/uni-ui/lib/uni-steps/uni-steps.vue';
 import UniSwipeAction from '@dcloudio/uni-ui/lib/uni-swipe-action/uni-swipe-action.vue';
-//? 多个 script 异常。 保留最后一个。
-// import UniSwipeActionItem from '@dcloudio/uni-ui/lib/uni-swipe-action-item/uni-swipe-action-item.vue';
 import UniSwipeActionItem from './lib/uni-swipe-action-item/uni-swipe-action-item.vue';
 import UniSwiperDot from '@dcloudio/uni-ui/lib/uni-swiper-dot/uni-swiper-dot.vue';
-// import UniTable from '@dcloudio/uni-ui/lib/uni-table/uni-table.vue';
 import UniTable from './lib/uni-table/uni-table.vue';
 import UniThead from '@dcloudio/uni-ui/lib/uni-thead/uni-thead.vue';
 import UniTBody from '@dcloudio/uni-ui/lib/uni-tbody/uni-tbody.vue';
-// import UniTr from '@dcloudio/uni-ui/lib/uni-tr/uni-tr.vue';
 import UniTr from './lib/uni-tr/uni-tr.vue';
-//? 编译器 原因： 声明了变量多次。 第119行
-// import UniTh from '@dcloudio/uni-ui/lib/uni-th/uni-th.vue';
 import UniTh from './lib/uni-th/uni-th.vue';
 import UniTd from './lib/uni-td/uni-td.vue';
 import UniTag from '@dcloudio/uni-ui/lib/uni-tag/uni-tag.vue';
 import UniTitle from '@dcloudio/uni-ui/lib/uni-title/uni-title.vue';
 import UniTooltip from '@dcloudio/uni-ui/lib/uni-tooltip/uni-tooltip.vue';
-import UniTransition from '@dcloudio/uni-ui/lib/uni-transition/uni-transition.vue';
-
-import UniPopupDialog from './lib/uni-popup-dialog/uni-popup-dialog.vue';
+import UniTransition from './lib/uni-transition/uni-transition.vue';
 
-// 62
 const components = {
   UniBadge,
   UniBreadcrumb,
@@ -108,8 +83,8 @@ const components = {
   UniDatetimePicker,
   UniDrawer,
   UniEasyinput,
-  UniFob,
-  UniFov,
+  UniFab,
+  UniFav,
   UniFilePicker,
   UniForms,
   UniFormsItem,
@@ -173,8 +148,8 @@ export {
   UniDatetimePicker,
   UniDrawer,
   UniEasyinput,
-  UniFob,
-  UniFov,
+  UniFab,
+  UniFav,
   UniFilePicker,
   UniForms,
   UniFormsItem,

package/src/uni-ui/lib/uni-collapse/uni-collapse.vue

@@ -0,0 +1,153 @@
+<template>
+  <view class="uni-collapse">
+    <slot />
+  </view>
+</template>
+<script>
+  /**
+   * Collapse 折叠面板
+   * @description 展示可以折叠 / 展开的内容区域
+   * @tutorial https://ext.dcloud.net.cn/plugin?id=23
+   * @property {String|Array} value 当前激活面板改变时触发(如果是手风琴模式，参数类型为string，否则为array)
+   * @property {Boolean} accordion = [true|false] 是否开启手风琴效果是否开启手风琴效果
+   * @event {Function} change 切换面板时触发，如果是手风琴模式，返回类型为string，否则为array
+   */
+  export default {
+    name: 'uniCollapse',
+    emits: ['change', 'activeItem', 'input', 'update:modelValue'],
+    props: {
+      // value: {
+      // 	type: [String, Array],
+      // 	default: ''
+      // },
+      modelValue: {
+        type: [String, Array],
+        default: ''
+      },
+      accordion: {
+        // 是否开启手风琴效果
+        type: [Boolean, String],
+        default: false
+      }
+    },
+    data() {
+      return {};
+    },
+    computed: {
+      // TODO 兼容 vue2 和 vue3
+      dataValue() {
+        let value =
+          (typeof this.value === 'string' && this.value === '') ||
+          (Array.isArray(this.value) && this.value.length === 0);
+        let modelValue =
+          (typeof this.modelValue === 'string' && this.modelValue === '') ||
+          (Array.isArray(this.modelValue) && this.modelValue.length === 0);
+        if (value) {
+          return this.modelValue;
+        }
+        if (modelValue) {
+          return this.value;
+        }
+
+        return this.value;
+      }
+    },
+    watch: {
+      dataValue(val) {
+        this.setOpen(val);
+      }
+    },
+    created() {
+      this.childrens = [];
+      this.names = [];
+    },
+    mounted() {
+      this.$nextTick(() => {
+        this.setOpen(this.dataValue);
+      });
+    },
+    methods: {
+      setOpen(val) {
+        let str = typeof val === 'string';
+        let arr = Array.isArray(val);
+        this.childrens.forEach((vm, index) => {
+          if (str) {
+            if (val === vm.nameSync) {
+              if (!this.accordion) {
+                console.warn(
+                  'accordion 属性为 false ,v-model 类型应该为 array'
+                );
+                return;
+              }
+              vm.isOpen = true;
+            }
+          }
+          if (arr) {
+            val.forEach((v) => {
+              if (v === vm.nameSync) {
+                if (this.accordion) {
+                  console.warn(
+                    'accordion 属性为 true ,v-model 类型应该为 string'
+                  );
+                  return;
+                }
+                vm.isOpen = true;
+              }
+            });
+          }
+        });
+        this.emit(val);
+      },
+      setAccordion(self) {
+        if (!this.accordion) return;
+        this.childrens.forEach((vm, index) => {
+          if (self !== vm) {
+            vm.isOpen = false;
+          }
+        });
+      },
+      resize() {
+        this.childrens.forEach((vm, index) => {
+          // #ifndef APP-NVUE
+          vm.getCollapseHeight();
+          // #endif
+          // #ifdef APP-NVUE
+          // vm.getNvueHwight()
+          // #endif
+        });
+      },
+      onChange(isOpen, self) {
+        let activeItem = [];
+
+        if (this.accordion) {
+          activeItem = isOpen ? self.nameSync : '';
+        } else {
+          this.childrens.forEach((vm, index) => {
+            if (vm.isOpen) {
+              activeItem.push(vm.nameSync);
+            }
+          });
+        }
+        this.$emit('change', activeItem);
+        this.emit(activeItem);
+      },
+      emit(val) {
+        this.$emit('input', val);
+        this.$emit('update:modelValue', val);
+      }
+    }
+  };
+</script>
+<style lang="scss">
+  .uni-collapse {
+    /* #ifndef APP-NVUE */
+    width: 100%;
+    display: flex;
+    /* #endif */
+    /* #ifdef APP-NVUE */
+    flex: 1;
+    /* #endif */
+    flex-direction: column;
+    background-color: #fff;
+  }
+</style>