@idooel/components 0.0.1-beta.2 → 0.0.1-beta.20

package/packages/composite-components/search-area/index.js

@@ -1,5 +1,5 @@
-import EleSearchArea from './src/index.vue'
-
-EleSearchArea.install = Vue => Vue.component(EleSearchArea.name, EleSearchArea)
-
+import EleSearchArea from './src/index.vue'
+
+EleSearchArea.install = Vue => Vue.component(EleSearchArea.name, EleSearchArea)
+
 export default EleSearchArea

package/packages/composite-components/search-area/src/index.vue

@@ -1,207 +1,226 @@
-<template>
-  <div class="search-area__wrapper">
-    <a-row :gutter="gutter">
-      <template v-for="(item, idx) in innerDataSource">
-        <a-col v-if="item._show" :span="item.span || span" :key="idx">
-          <div v-if="item.type == '_action'" class="search-area__item search-area--action">
-            <ele-button icon="search" type="primary" @click="handleClickSearch">查询</ele-button>
-            <ele-button style="margin-left:8px;" icon="reload" @click="handleClickReset">重置</ele-button>
-            <div class="expand-collapse" @click="handleClickExpandCollapse">
-              <span class="expand-collapse__text">{{ isExpand ? '收起' : '展开' }}</span>
-              <span class="expand-collapse__icon">
-                <a-icon v-if="isExpand" type="up" />
-                <a-icon v-else type="down" />
-              </span>
-            </div>
-          </div>
-          <div v-else class="search-area__item">
-            <template v-if="item.type == 'Input'">
-              <Label :label="item.label"></Label>
-              <ele-input v-model="item._value"></ele-input>
-            </template>
-            <template v-else-if="item.type == 'Select'">
-              <Label :label="item.label"></Label>
-              <ele-select v-model="item._value" :data-source="item.optionList"></ele-select>
-            </template>
-            <template v-else-if="item.type == 'DatePicker'">
-              <Label :label="item.label"></Label>
-              <ele-date v-model="item._value" :format="item.format"></ele-date>
-            </template>
-          </div>
-        </a-col>
-      </template>
-    </a-row>
-  </div>
-</template>
-
-<script>
-import EleInput from '../../../input/src/index.vue'
-import EleSelect from '../../../select/src/index.vue'
-import ELeButton from '../../../button/src/index.vue'
-import EleDate from '../../../date/src/index.vue'
-import Label from './label.vue'
-import moment from 'moment'
-import { parse } from '@idooel/expression'
-export default {
-  name: 'ele-search-area',
-  components: {
-    EleInput,
-    EleSelect,
-    ELeButton,
-    Label,
-    EleDate
-  },
-  props: {
-    gutter: {
-      type: [Number, Array, Object],
-      default: () => ([
-        16, 8
-      ])
-    },
-    span: {
-      type: Number,
-      default: 8
-    },
-    dataSource: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    return {
-      isExpand: false
-    }
-  },
-  computed: {
-    cuttingFormula () {
-      return (24 / this.span - 1)
-    },
-    buildDataSource () {
-      return this.controlDisplayByFormula(this.mapDefaultValueToValue())
-    },
-    innerDataSource () {
-      return [ ...this.buildDataSource, { type: '_action', _show: true }]
-    }
-  },
-  created() {},
-  methods: {
-    controlDisplayByFormula (dataSource = []) {
-      if (this.isExpand) {
-        dataSource.forEach(item => {
-          this.$set(item, '_show', true)
-        })
-      } else {
-        dataSource.forEach((item, idx) => {
-          if (idx < this.cuttingFormula) {
-            this.$set(item, '_show', true)
-          } else {
-            this.$set(item, '_show', false)
-          }
-        })
-      }
-      return dataSource
-    },
-    buildDefaultValue (arg) {
-      if (!arg || arg.charAt(0) !== '_') return arg
-      return parse(arg, {
-        _route: this.$route.query
-      })
-    },
-    mapDefaultValueToValue () {
-      this.dataSource.forEach(props => {
-        this.$set(props, '_show', this.isExpand)
-        if (props.defaultValue) {
-          this.$set(props, '_value', this.buildDefaultValue(props.defaultValue))
-        }
-      })
-      return this.dataSource
-    },
-    handleClickExpandCollapse () {
-      this.isExpand = !this.isExpand
-    },
-    handleClickSearch () {
-      const querys = this.extractValues()
-      this.$emit('search', querys)
-    },
-    extractValues () {
-      let ret = {}
-      this.innerDataSource.filter(item => item.type !== '_action').forEach(item => {
-        switch (item.type) {
-          case 'DatePicker':
-            ret[item.name] = typeof item._value == 'undefined' ? undefined : moment(item._value).format(item.format)
-            break
-          default:
-            ret[item.name] = item._value
-            break
-        }
-      })
-      return ret
-    },
-    handleClickReset () {
-      this.innerDataSource.filter(item => item.type !== '_action').forEach(item => {
-        const { defaultValue } = item
-        switch (item.type) {
-          case 'Select':
-            defaultValue && this.$set(item, '_value', this.buildDefaultValue(defaultValue))
-            !defaultValue && this.$set(item, '_value', null)
-            break
-          case 'DatePicker':
-            defaultValue && this.$set(item, '_value', this.buildDefaultValue(defaultValue))
-            !defaultValue && this.$set(item, '_value', undefined)
-            break
-          default:
-            defaultValue && this.$set(item, '_value', this.buildDefaultValue(defaultValue))
-            !defaultValue && this.$set(item, '_value', null)
-            break
-        }
-      })
-      //TODO defaultValue
-      const querys = this.extractValues()
-      this.$emit('search', querys)
-    },
-    onChangeSelect (value, props) {
-      this.$set(props, '_value', value)
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.search-area__wrapper {
-  padding-top: 16px;
-  padding-left: 16px;
-  padding-right: 16px;
-  ::v-deep .ant-col {
-    &:last-child {
-      float: right;
-    }
-  }
-  .search-area__item {
-    height: 32px;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    &.search-area--action {
-      justify-content: end;
-    }
-    .expand-collapse {
-      margin-left: 8px;
-      height: 32px;
-      padding: 4px 16px;
-      color: var(--idooel-primary-color);
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      justify-content: center;
-      cursor: pointer;
-      .expand-collapse__text {
-        font-size: 14px;
-      }
-      .expand-collapse__icon {
-        font-size: 16px;
-        margin-left: 8px;
-      }
-    }
-  }
-}
+<template>
+  <div class="search-area__wrapper">
+    <a-row :gutter="gutter">
+      <template v-for="(item, idx) in innerDataSource">
+        <a-col v-if="item._show" :span="item.span || span" :key="idx">
+          <div v-if="item.type == '_action'" class="search-area__item search-area--action">
+            <ele-button icon="search" type="primary" @click="handleClickSearch">查询</ele-button>
+            <ele-button style="margin-left:8px;" icon="reload" @click="handleClickReset">重置</ele-button>
+            <div class="expand-collapse" @click="handleClickExpandCollapse">
+              <span class="expand-collapse__text">{{ isExpand ? '收起' : '展开' }}</span>
+              <span class="expand-collapse__icon">
+                <a-icon v-if="isExpand" type="up" />
+                <a-icon v-else type="down" />
+              </span>
+            </div>
+          </div>
+          <div v-else class="search-area__item">
+            <template v-if="item.type == 'Input'">
+              <Label :label="item.label"></Label>
+              <ele-input v-model="item._value"></ele-input>
+            </template>
+            <template v-else-if="item.type == 'Select'">
+              <Label :label="item.label"></Label>
+              <ele-select v-model="item._value" :data-source="item.optionList"></ele-select>
+            </template>
+            <template v-else-if="item.type == 'DatePicker'">
+              <Label :label="item.label"></Label>
+              <ele-date v-model="item._value" :format="item.format"></ele-date>
+            </template>
+            <template v-else-if="item.type == 'ele-date-range'">
+              <Label :label="item.label"></Label>
+              <ele-date-range v-model="item._value" :format="item.format" :show-time="item.showTime"></ele-date-range>
+            </template>
+          </div>
+        </a-col>
+      </template>
+    </a-row>
+  </div>
+</template>
+
+<script>
+import EleInput from '../../../input/src/index.vue'
+import EleSelect from '../../../select/src/index.vue'
+import ELeButton from '../../../button/src/index.vue'
+import EleDate from '../../../date/src/index.vue'
+import Label from './label.vue'
+import moment from 'moment'
+import { parse } from '@idooel/expression'
+export default {
+  name: 'ele-search-area',
+  components: {
+    EleInput,
+    EleSelect,
+    ELeButton,
+    Label,
+    EleDate
+  },
+  props: {
+    gutter: {
+      type: [Number, Array, Object],
+      default: () => ([
+        16, 8
+      ])
+    },
+    span: {
+      type: Number,
+      default: 8
+    },
+    dataSource: {
+      type: Array,
+      required: true
+    }
+  },
+  data() {
+    return {
+      isExpand: false
+    }
+  },
+  computed: {
+    cuttingFormula () {
+      return (24 / this.span - 1)
+    },
+    buildDataSource () {
+      return this.controlDisplayByFormula(this.mapDefaultValueToValue())
+    },
+    innerDataSource () {
+      return [ ...this.buildDataSource, { type: '_action', _show: true }]
+    }
+  },
+  created() {},
+  methods: {
+    controlDisplayByFormula (dataSource = []) {
+      if (this.isExpand) {
+        dataSource.forEach(item => {
+          this.$set(item, '_show', true)
+        })
+      } else {
+        dataSource.forEach((item, idx) => {
+          if (idx < this.cuttingFormula) {
+            this.$set(item, '_show', true)
+          } else {
+            this.$set(item, '_show', false)
+          }
+        })
+      }
+      return dataSource
+    },
+    buildDefaultValue (arg) {
+      if (!arg || arg.charAt(0) !== '_') return arg
+      return parse(arg, {
+        _route: this.$route.query
+      })
+    },
+    mapDefaultValueToValue () {
+      this.dataSource.forEach(props => {
+        this.$set(props, '_show', this.isExpand)
+        if (props.defaultValue) {
+          this.$set(props, '_value', this.buildDefaultValue(props.defaultValue))
+        }
+      })
+      return this.dataSource
+    },
+    handleClickExpandCollapse () {
+      this.isExpand = !this.isExpand
+    },
+    handleClickSearch () {
+      const querys = this.extractValues()
+      this.$emit('search', querys)
+    },
+    buildMapto (mapTo = [], dataSource) {
+      const [ startField, endField ] = mapTo
+      const [ startValue, endValue ] = dataSource || [null, null]
+      return {
+        [startField]: startValue,
+        [endField]: endValue
+      }
+    },
+    extractValues () {
+      let ret = {}
+      this.innerDataSource.filter(item => item.type !== '_action').forEach(item => {
+        switch (item.type) {
+          case 'DatePicker':
+            ret[item.name] = typeof item._value == 'undefined' ? undefined : moment(item._value).format(item.format)
+            break
+          case 'ele-date-range':
+            Object.assign(ret, this.buildMapto(item.mapTo, item._value))
+            break
+          default:
+            ret[item.name] = item._value
+            break
+        }
+      })
+      return ret
+    },
+    handleClickReset () {
+      this.innerDataSource.filter(item => item.type !== '_action').forEach(item => {
+        const { defaultValue } = item
+        switch (item.type) {
+          case 'Select':
+            defaultValue && this.$set(item, '_value', this.buildDefaultValue(defaultValue))
+            !defaultValue && this.$set(item, '_value', null)
+            break
+          case 'DatePicker':
+            defaultValue && this.$set(item, '_value', this.buildDefaultValue(defaultValue))
+            !defaultValue && this.$set(item, '_value', undefined)
+            break
+          case 'ele-date-picker':
+            defaultValue && this.$set(item, '_value', this.buildDefaultValue(defaultValue))
+            !defaultValue && this.$set(item, '_value', [])
+            break
+          default:
+            defaultValue && this.$set(item, '_value', this.buildDefaultValue(defaultValue))
+            !defaultValue && this.$set(item, '_value', null)
+            break
+        }
+      })
+      //TODO defaultValue
+      const querys = this.extractValues()
+      this.$emit('search', querys)
+    },
+    onChangeSelect (value, props) {
+      this.$set(props, '_value', value)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.search-area__wrapper {
+  padding-top: 16px;
+  padding-left: 16px;
+  padding-right: 16px;
+  ::v-deep .ant-col {
+    &:last-child {
+      float: right;
+    }
+  }
+  .search-area__item {
+    height: 32px;
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    &.search-area--action {
+      justify-content: end;
+    }
+    .expand-collapse {
+      margin-left: 8px;
+      height: 32px;
+      padding: 4px 16px;
+      color: var(--idooel-primary-color);
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: center;
+      cursor: pointer;
+      .expand-collapse__text {
+        font-size: 14px;
+      }
+      .expand-collapse__icon {
+        font-size: 16px;
+        margin-left: 8px;
+      }
+    }
+  }
+}
 </style>

package/packages/composite-components/search-area/src/label.vue

@@ -1,36 +1,36 @@
-<template>
-  <div class="g-search__label">
-    <span class="label__title">{{ label }}</span>
-    <span class="label__suffix">：</span>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    label: {
-      type: String
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.g-search__label {
-  /* width: 69px; */
-  flex-basis: 69px;
-  height: 32px;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  justify-content: space-between;
-  .label__title, .label__suffix {
-    font-size: 14px;
-    color: rgba(0, 0, 0, 0.88);
-    white-space: nowrap;
-  }
-  .label__suffix {
-    margin-left: 4px;
-  }
-}
+<template>
+  <div class="g-search__label">
+    <span class="label__title">{{ label }}</span>
+    <span class="label__suffix">：</span>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    label: {
+      type: String
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.g-search__label {
+  /* width: 69px; */
+  flex-basis: 69px;
+  height: 32px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  .label__title, .label__suffix {
+    font-size: 14px;
+    color: rgba(0, 0, 0, 0.88);
+    white-space: nowrap;
+  }
+  .label__suffix {
+    margin-left: 4px;
+  }
+}
 </style>

package/packages/date/index.js

@@ -1,5 +1,5 @@
-import EleDate from './src/index.vue'
-
-EleDate.install = Vue => Vue.component(EleDate.name, EleDate)
-
+import EleDate from './src/index.vue'
+
+EleDate.install = Vue => Vue.component(EleDate.name, EleDate)
+
 export default EleDate

package/packages/date/src/index.vue

@@ -1,40 +1,40 @@
-<template>
-  <a-date-picker 
-    style="width: 100%;" 
-    mode="year"
-    :open="open"
-    :value="value"
-    @focus="onFocus"
-    @panelChange="onPanelChange"
-    :format="format">
-  </a-date-picker>
-</template>
-
-<script>
-export default {
-  name: 'ele-date',
-  props: {
-    value: {
-      type: Object
-    },
-    format: {
-      type: String,
-      default: 'YYYY/MM/DD'
-    }
-  },
-  data () {
-    return {
-      open: false
-    }
-  },
-  methods: {
-    onFocus () {
-      this.open = true
-    },
-    onPanelChange (value, mode) {
-      this.$emit('input', value)
-      this.open = false
-    }
-  }
-}
+<template>
+  <a-date-picker 
+    style="width: 100%;" 
+    mode="year"
+    :open="open"
+    :value="value"
+    @focus="onFocus"
+    @panelChange="onPanelChange"
+    :format="format">
+  </a-date-picker>
+</template>
+
+<script>
+export default {
+  name: 'ele-date',
+  props: {
+    value: {
+      type: Object
+    },
+    format: {
+      type: String,
+      default: 'YYYY/MM/DD'
+    }
+  },
+  data () {
+    return {
+      open: false
+    }
+  },
+  methods: {
+    onFocus () {
+      this.open = true
+    },
+    onPanelChange (value, mode) {
+      this.$emit('input', value)
+      this.open = false
+    }
+  }
+}
 </script>

package/packages/date-range/index.js

@@ -0,0 +1,5 @@
+import EleDateRange from './src/index.vue'
+
+EleDateRange.install = Vue => Vue.component(EleDateRange.name, EleDateRange)
+
+export default EleDateRange

package/packages/date-range/src/index.vue

@@ -0,0 +1,42 @@
+<template>
+  <a-range-picker 
+    style="width: 100%;"
+    :show-time="showTime"
+    :value="value" 
+    :format="format" 
+    @change="onChange">
+  </a-range-picker>
+</template>
+
+<script>
+export default {
+  name: 'ele-date-range',
+  model: {
+    prop: 'value',
+    event: 'change'
+  },
+  props: {
+    showTime: {
+      type: Object
+    },
+    format: {
+      type: Array,
+      default: () => ['YYYY-MM-DD', 'YYYY-MM-DD']
+    },
+    value: {
+      type: Array,
+      default: () => []
+    }
+  },
+  methods: {
+    onChange (date, dateString) {
+      this.$emit('change', dateString)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>
+import { models } from '../..';