Merge branch 'dev' of github.com:opentiny/tiny-vue into release

opentiny · Oct 23, 2023 · eb366ad · eb366ad
2 parents 06ac1b5 + d7623d1
commit eb366ad
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 139 deletions.
diff --git a/examples/sites/demos/pc/app/grid/webdoc/grid.js b/examples/sites/demos/pc/app/grid/webdoc/grid.js
diff --git a/examples/sites/demos/pc/app/select/size-medium.vue b/examples/sites/demos/pc/app/select/size-medium.vue
@@ -1,13 +1,23 @@
 <template>
+  <div class="fontStyle">medium</div>
   <tiny-select v-model="value" placeholder="请选择" size="medium" multiple :options="options"></tiny-select>
+  <div class="fontStyle">small</div>
+  <tiny-select v-model="value1" placeholder="请选择" size="small" multiple>
+    <tiny-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </tiny-option>
+  </tiny-select>
+  <div class="fontStyle">mini</div>
+  <tiny-select v-model="value2" placeholder="请选择" size="mini" multiple>
+    <tiny-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </tiny-option>
+  </tiny-select>
 </template>
 
 <script lang="jsx">
-import { Select } from '@opentiny/vue'
+import { Option, Select } from '@opentiny/vue'
 
 export default {
   components: {
-    TinySelect: Select
+    TinySelect: Select,
+    TinyOption: Option
   },
   data() {
     return {
@@ -18,8 +28,17 @@ export default {
         { value: '选项4', label: '龙须面' },
         { value: '选项5', label: '北京烤鸭' }
       ],
-      value: ''
+      value: '',
+      value1: '',
+      value2: ''
     }
   }
 }
 </script>
+
+<style>
+.fontStyle {
+  font-size: 14px;
+  margin: 8px;
+}
+</style>
diff --git a/examples/sites/demos/pc/app/select/size-mini.spec.ts b/examples/sites/demos/pc/app/select/size-mini.spec.ts
diff --git a/examples/sites/demos/pc/app/select/size-mini.vue b/examples/sites/demos/pc/app/select/size-mini.vue
diff --git a/examples/sites/demos/pc/app/select/size-small.spec.ts b/examples/sites/demos/pc/app/select/size-small.spec.ts
diff --git a/examples/sites/demos/pc/app/select/size-small.vue b/examples/sites/demos/pc/app/select/size-small.vue
diff --git a/examples/sites/demos/pc/app/select/webdoc/select.js b/examples/sites/demos/pc/app/select/webdoc/select.js
@@ -128,30 +128,14 @@ export default {
     },
     {
       'demoId': 'size-medium',
-      'name': { 'zh-CN': 'medium', 'en-US': 'small' },
+      'name': { 'zh-CN': 'select', 'en-US': 'small' },
       'desc': {
         'zh-CN':
           '<p>通过 <code>size</code> 属性定义输入框尺寸，可选项有 medium、small、mini 。\n通过 <code>options</code> 配置 Select 数据项，使用后不需要再配置 tiny-option。</p>\n',
         'en-US': 'For details, see the following example.'
       },
       'codeFiles': ['size-medium.vue']
     },
-    {
-      'demoId': 'size-small',
-      'name': { 'zh-CN': 'small', 'en-US': 'mini' },
-      'desc': { 'zh-CN': '详细用法参考如下示例', 'en-US': 'For details, see the following example.' },
-      'codeFiles': ['size-small.vue']
-    },
-    {
-      'demoId': 'size-mini',
-      'name': { 'zh-CN': 'mini', 'en-US': 'Group' },
-      'desc': {
-        'zh-CN': '详细用法参考如下示例',
-        'en-US':
-          '<p> uses <code>tiny-option-group</code> to group options. The <code>label</code> attribute is the group name. Use the <code>disabled</code> attribute to disable all options in the group. </p>\n'
-      },
-      'codeFiles': ['size-mini.vue']
-    },
     {
       'demoId': 'option-group',
       'name': { 'zh-CN': '分组', 'en-US': 'Disable some options for grouping' },