From fe9dbf10bd087464a7b70aa9b74d2dbe0b55ca81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=95=8F?= <cookfront@gmail.com>
Date: Mon, 28 Jan 2019 09:50:37 +0800
Subject: [PATCH] [improvement] TreeSelect: jsx (#2638)

---
 packages/tree-select/index.js                 | 100 ++++++++++++++++++
 packages/tree-select/index.vue                |  78 --------------
 .../test/__snapshots__/demo.spec.js.snap      |  39 ++-----
 3 files changed, 108 insertions(+), 109 deletions(-)
 create mode 100644 packages/tree-select/index.js
 delete mode 100644 packages/tree-select/index.vue

diff --git a/packages/tree-select/index.js b/packages/tree-select/index.js
new file mode 100644
index 000000000..bd6b981bd
--- /dev/null
+++ b/packages/tree-select/index.js
@@ -0,0 +1,100 @@
+import { use } from '../utils';
+import Icon from '../icon';
+
+const [sfc, bem] = use('tree-select');
+
+export default sfc({
+  props: {
+    items: Array,
+    mainActiveIndex: Number,
+    activeId: {
+      type: [Number, String],
+      default: 0
+    },
+    height: {
+      type: Number,
+      default: 300
+    }
+  },
+
+  computed: {
+    subItems() {
+      const selectedItem = this.items[this.mainActiveIndex] || {};
+      return selectedItem.children || [];
+    }
+  },
+
+  methods: {
+    onClickNav(data, index) {
+      if (!data.disabled) {
+        this.$emit('navclick', index);
+      }
+    },
+
+    onItemSelect(data) {
+      if (!data.disabled) {
+        this.$emit('itemclick', data);
+      }
+    }
+  },
+
+  render(h) {
+    const {
+      height,
+      items,
+      mainActiveIndex,
+      activeId,
+      subItems
+    } = this;
+
+    return (
+      <div class={bem()} style={{ height: height + 'px' }}>
+        <div class={bem('nav')}>
+          {items.map((item, index) => (
+            <div
+              key={index}
+              class={[
+                'van-ellipsis',
+                bem('nitem', {
+                  active: mainActiveIndex === index,
+                  disabled: item.disabled
+                })
+              ]}
+              onClick={() => {
+                this.onClickNav(item, index);
+              }}
+            >
+              { item.text }
+            </div>
+          ))}
+        </div>
+        <div class={bem('content')}>
+          {subItems.map(item => (
+            <div
+              key={item.id}
+              class={[
+                'van-ellipsis',
+                bem('item', {
+                  active: activeId === item.id,
+                  disabled: item.disabled
+                })
+              ]}
+              onClick={() => {
+                this.onItemSelect(item);
+              }}
+            >
+              { item.text }
+              {activeId === item.id && (
+                <Icon
+                  name="checked"
+                  size="16px"
+                  class={bem('selected')}
+                />
+              )}
+            </div>
+          ))}
+        </div>
+      </div>
+    );
+  }
+});
diff --git a/packages/tree-select/index.vue b/packages/tree-select/index.vue
deleted file mode 100644
index 1ad4ebca6..000000000
--- a/packages/tree-select/index.vue
+++ /dev/null
@@ -1,78 +0,0 @@
-<template>
-  <div
-    :class="b()"
-    :style="{ height: height + 'px' }"
-  >
-    <div :class="b('nav')">
-      <div
-        v-for="(item, index) in items"
-        v-text="item.text"
-        class="van-ellipsis"
-        :class="b('nitem', { active: mainActiveIndex === index, disabled: item.disabled })"
-        @click="onClickNav(item, index)"
-      />
-    </div>
-    <div :class="b('content')">
-      <div
-        v-for="item in subItems"
-        :key="item.id"
-        class="van-ellipsis"
-        :class="b('item', {
-          active: activeId === item.id,
-          disabled: item.disabled
-        })"
-        @click="onItemSelect(item)"
-      >
-        {{ item.text }}
-        <icon
-          v-if="activeId === item.id"
-          name="checked"
-          size="16px"
-          :class="b('selected')"
-        />
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import create from '../utils/create';
-
-export default create({
-  name: 'tree-select',
-
-  props: {
-    items: Array,
-    mainActiveIndex: Number,
-    activeId: {
-      type: [Number, String],
-      default: 0
-    },
-    height: {
-      type: Number,
-      default: 300
-    }
-  },
-
-  computed: {
-    subItems() {
-      const selectedItem = this.items[this.mainActiveIndex] || {};
-      return selectedItem.children || [];
-    }
-  },
-
-  methods: {
-    onClickNav(data, index) {
-      if (!data.disabled) {
-        this.$emit('navclick', index);
-      }
-    },
-
-    onItemSelect(data) {
-      if (!data.disabled) {
-        this.$emit('itemclick', data);
-      }
-    }
-  }
-});
-</script>
diff --git a/packages/tree-select/test/__snapshots__/demo.spec.js.snap b/packages/tree-select/test/__snapshots__/demo.spec.js.snap
index 8864aa371..e4a54a1ac 100644
--- a/packages/tree-select/test/__snapshots__/demo.spec.js.snap
+++ b/packages/tree-select/test/__snapshots__/demo.spec.js.snap
@@ -11,38 +11,15 @@ exports[`renders demo correctly 1`] = `
         <div class="van-ellipsis van-tree-select__nitem van-tree-select__nitem--disabled">福建</div>
       </div>
       <div class="van-tree-select__content">
-        <div class="van-ellipsis van-tree-select__item van-tree-select__item--active">
-          杭州
-          <i class="van-icon van-icon-checked van-tree-select__selected" style="color:undefined;font-size:16px;">
+        <div class="van-ellipsis van-tree-select__item van-tree-select__item--active">杭州<i class="van-icon van-icon-checked van-tree-select__selected" style="color:undefined;font-size:16px;">
             <!----></i></div>
-        <div class="van-ellipsis van-tree-select__item">
-          温州
-          <!---->
-        </div>
-        <div class="van-ellipsis van-tree-select__item van-tree-select__item--disabled">
-          宁波
-          <!---->
-        </div>
-        <div class="van-ellipsis van-tree-select__item">
-          义乌
-          <!---->
-        </div>
-        <div class="van-ellipsis van-tree-select__item">
-          南京
-          <!---->
-        </div>
-        <div class="van-ellipsis van-tree-select__item">
-          无锡
-          <!---->
-        </div>
-        <div class="van-ellipsis van-tree-select__item">
-          徐州
-          <!---->
-        </div>
-        <div class="van-ellipsis van-tree-select__item">
-          苏州
-          <!---->
-        </div>
+        <div class="van-ellipsis van-tree-select__item">温州</div>
+        <div class="van-ellipsis van-tree-select__item van-tree-select__item--disabled">宁波</div>
+        <div class="van-ellipsis van-tree-select__item">义乌</div>
+        <div class="van-ellipsis van-tree-select__item">南京</div>
+        <div class="van-ellipsis van-tree-select__item">无锡</div>
+        <div class="van-ellipsis van-tree-select__item">徐州</div>
+        <div class="van-ellipsis van-tree-select__item">苏州</div>
       </div>
     </div>
   </div>