fit2cloud-ui-plus 0.0.1-beta.16 → 0.0.1-beta.17

package/src/components/search-bar/FuComplexSearch.vue

@@ -1,170 +1,170 @@
-<template>
-  <div class="fu-complex-search">
-    <el-popover
-      trigger="manual"
-      v-model="active"
-      :visible-arrow="false"
-      @hide="closePopover"
-      popper-class="fu-complex-components">
-
-      <div class="fu-complex-components__body">
-        <slot></slot>
-      </div>
-      <div class="fu-complex-components__footer">
-        <el-button @click="active=false" :size="size">{{ t('fu.search_bar.cancel') }}</el-button>
-        <el-button type="primary" @click="ok" :size="size">{{ t('fu.search_bar.ok') }}</el-button>
-      </div>
-
-      <fu-search-bar-button
-        slot="reference"
-        icon="el-icon-arrow-right"
-        @click="toggle"
-        :size="size"
-        :class="['fu-complex-search__trigger',{'is-active':active}]"
-        :tooltip="t('fu.search_bar.adv_search')"/>
-    </el-popover>
-  </div>
-</template>
-
-<script setup lang="ts">
-import {ref, computed} from "vue";
-import {useLocale} from "@/hooks"
-import {validateSize} from "@/tools/size";
-import FuSearchBarButton from "@/components/search-bar/FuSearchBarButton";
-
-defineOptions({name: "FuComplexSearch"});
-
-defineProps({
-  size: {
-    type: String,
-    validator: validateSize
-  },
-  resultCount: Number,
-  quickPlaceholder: String,
-  components: Array
-})
-
-const emit = defineEmits(["exec"])
-
-const quick = ref("")
-const conditions = ref([])
-
-const filterRef = ref()
-
-const {t} = useLocale()
-
-function open() {
-  filterRef.value?.open()
-}
-
-function change() {
-  emit("exec", conditionObj.value)
-}
-
-function filter(c: any) {
-  conditions.value = c
-  emit("exec", conditionObj.value)
-}
-
-function setConditions(conditionObj: any) {
-  filterRef.value?.setConditions(conditionObj)
-}
-
-const conditionObj = computed(() => {
-  let obj: any = {quick: quick.value}
-  conditions.value.forEach((c: any) => {
-    obj[c.field] = c
-  })
-  return obj
-});
-
-defineExpose({
-  setConditions
-})
-</script>
-
-<script>
-import FuSearchBarButton from "@/components/search-bar/FuSearchBarButton";
-import Locale from "@/mixins/locale";
-import ConfigSize from "@/mixins/config-size";
-
-export default {
-  name: "FuComplexSearch",
-  components: {FuSearchBarButton},
-  mixins: [Locale, ConfigSize],
-  props: {
-    components: Array,
-  },
-  data() {
-    return {
-      active: false,
-    }
-  },
-  methods: {
-    closePopover() {
-      this.$emit("close")
-    },
-    toggle() {
-      this.active = !this.active
-      this.refs.forEach(r => {
-        if (r.init) {
-          r.init()
-        } else {
-          console.warn("init undefined", r)
-        }
-      })
-    },
-    close() {
-      this.active = false
-    },
-    ok() {
-      this.active = false
-      let conditions = [];
-      this.refs.forEach(r => {
-        let condition
-        if (r.getCondition) {
-          condition = r.getCondition()
-        } else {
-          console.warn("getCondition undefined", r)
-        }
-        if (condition && condition.value !== undefined) {
-          conditions.push(condition)
-        }
-      })
-      this.$emit("change", conditions)
-    },
-    createConditions(conditions) {
-      let result = []
-      if (conditions) {
-        Object.keys(conditions).forEach(key => {
-          let c = conditions[key]
-          this.refs.forEach(r => {
-            if (r.field === key) {
-              result.push(r.createCondition(c.value, c.operator))
-            }
-          })
-        })
-      }
-      return result
-    }
-  },
-  computed: {
-    refs() {
-      let refs = [];
-      if (this.$slots?.default) {
-        // 使用slot
-        this.$slots.default.forEach(component => {
-          refs.push(component.componentInstance)
-        })
-      } else {
-        // 使用components
-        let $refs = this.$refs
-        this.components.forEach(c => {
-          refs.push($refs[c.field][0])
-        })
-      }
-      return refs
-    }
-  }
-}
-</script>
+<!--<template>-->
+<!--  <div class="fu-complex-search">-->
+<!--    <el-popover-->
+<!--      trigger="manual"-->
+<!--      v-model="active"-->
+<!--      :visible-arrow="false"-->
+<!--      @hide="closePopover"-->
+<!--      popper-class="fu-complex-components">-->
+
+<!--      <div class="fu-complex-components__body">-->
+<!--        <slot></slot>-->
+<!--      </div>-->
+<!--      <div class="fu-complex-components__footer">-->
+<!--        <el-button @click="active=false" :size="size">{{ t('fu.search_bar.cancel') }}</el-button>-->
+<!--        <el-button type="primary" @click="ok" :size="size">{{ t('fu.search_bar.ok') }}</el-button>-->
+<!--      </div>-->
+
+<!--      <fu-search-bar-button-->
+<!--        slot="reference"-->
+<!--        icon="el-icon-arrow-right"-->
+<!--        @click="toggle"-->
+<!--        :size="size"-->
+<!--        :class="['fu-complex-search__trigger',{'is-active':active}]"-->
+<!--        :tooltip="t('fu.search_bar.adv_search')"/>-->
+<!--    </el-popover>-->
+<!--  </div>-->
+<!--</template>-->
+
+<!--<script setup lang="ts">-->
+<!--import {ref, computed} from "vue";-->
+<!--import {useLocale} from "@/hooks"-->
+<!--import {validateSize} from "@/tools/size";-->
+<!--import FuSearchBarButton from "@/components/search-bar/FuSearchBarButton";-->
+
+<!--defineOptions({name: "FuComplexSearch"});-->
+
+<!--defineProps({-->
+<!--  size: {-->
+<!--    type: String,-->
+<!--    validator: validateSize-->
+<!--  },-->
+<!--  resultCount: Number,-->
+<!--  quickPlaceholder: String,-->
+<!--  components: Array-->
+<!--})-->
+
+<!--const emit = defineEmits(["exec"])-->
+
+<!--const quick = ref("")-->
+<!--const conditions = ref([])-->
+
+<!--const filterRef = ref()-->
+
+<!--const {t} = useLocale()-->
+
+<!--function open() {-->
+<!--  filterRef.value?.open()-->
+<!--}-->
+
+<!--function change() {-->
+<!--  emit("exec", conditionObj.value)-->
+<!--}-->
+
+<!--function filter(c: any) {-->
+<!--  conditions.value = c-->
+<!--  emit("exec", conditionObj.value)-->
+<!--}-->
+
+<!--function setConditions(conditionObj: any) {-->
+<!--  filterRef.value?.setConditions(conditionObj)-->
+<!--}-->
+
+<!--const conditionObj = computed(() => {-->
+<!--  let obj: any = {quick: quick.value}-->
+<!--  conditions.value.forEach((c: any) => {-->
+<!--    obj[c.field] = c-->
+<!--  })-->
+<!--  return obj-->
+<!--});-->
+
+<!--defineExpose({-->
+<!--  setConditions-->
+<!--})-->
+<!--</script>-->
+
+<!--<script>-->
+<!--import FuSearchBarButton from "@/components/search-bar/FuSearchBarButton";-->
+<!--import Locale from "@/mixins/locale";-->
+<!--import ConfigSize from "@/mixins/config-size";-->
+
+<!--export default {-->
+<!--  name: "FuComplexSearch",-->
+<!--  components: {FuSearchBarButton},-->
+<!--  mixins: [Locale, ConfigSize],-->
+<!--  props: {-->
+<!--    components: Array,-->
+<!--  },-->
+<!--  data() {-->
+<!--    return {-->
+<!--      active: false,-->
+<!--    }-->
+<!--  },-->
+<!--  methods: {-->
+<!--    closePopover() {-->
+<!--      this.$emit("close")-->
+<!--    },-->
+<!--    toggle() {-->
+<!--      this.active = !this.active-->
+<!--      this.refs.forEach(r => {-->
+<!--        if (r.init) {-->
+<!--          r.init()-->
+<!--        } else {-->
+<!--          console.warn("init undefined", r)-->
+<!--        }-->
+<!--      })-->
+<!--    },-->
+<!--    close() {-->
+<!--      this.active = false-->
+<!--    },-->
+<!--    ok() {-->
+<!--      this.active = false-->
+<!--      let conditions = [];-->
+<!--      this.refs.forEach(r => {-->
+<!--        let condition-->
+<!--        if (r.getCondition) {-->
+<!--          condition = r.getCondition()-->
+<!--        } else {-->
+<!--          console.warn("getCondition undefined", r)-->
+<!--        }-->
+<!--        if (condition && condition.value !== undefined) {-->
+<!--          conditions.push(condition)-->
+<!--        }-->
+<!--      })-->
+<!--      this.$emit("change", conditions)-->
+<!--    },-->
+<!--    createConditions(conditions) {-->
+<!--      let result = []-->
+<!--      if (conditions) {-->
+<!--        Object.keys(conditions).forEach(key => {-->
+<!--          let c = conditions[key]-->
+<!--          this.refs.forEach(r => {-->
+<!--            if (r.field === key) {-->
+<!--              result.push(r.createCondition(c.value, c.operator))-->
+<!--            }-->
+<!--          })-->
+<!--        })-->
+<!--      }-->
+<!--      return result-->
+<!--    }-->
+<!--  },-->
+<!--  computed: {-->
+<!--    refs() {-->
+<!--      let refs = [];-->
+<!--      if (this.$slots?.default) {-->
+<!--        // 使用slot-->
+<!--        this.$slots.default.forEach(component => {-->
+<!--          refs.push(component.componentInstance)-->
+<!--        })-->
+<!--      } else {-->
+<!--        // 使用components-->
+<!--        let $refs = this.$refs-->
+<!--        this.components.forEach(c => {-->
+<!--          refs.push($refs[c.field][0])-->
+<!--        })-->
+<!--      }-->
+<!--      return refs-->
+<!--    }-->
+<!--  }-->
+<!--}-->
+<!--</script>-->

package/src/components/search-bar/FuQuickSearch.vue

@@ -2,7 +2,7 @@
   <div :class="['fu-quick-search', 'fu-quick-search--' + size]">
     <i class="el-icon-search" v-if="useIcon"/>
     <label>
-      <input :placeholder="placeholder" v-model="quick" @input="input" @blur="blur" @keydown="keydown"/>
+      <input :placeholder="placeholder" v-model="quick" @blur="blur" @keydown="keydown"/>
     </label>
   </div>
 </template>
@@ -52,43 +52,3 @@ function keydown(e: KeyboardEvent) {
   }
 }
 </script>
-
-<script>
-import ConfigSize from "@/mixins/config-size";
-
-export default {
-  name: "FuQuickSearch",
-  mixins: [ConfigSize],
-  props: {
-    value: String,
-    placeholder: String,
-    useIcon: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      quick: ""
-    }
-  },
-  watch: {
-    value(v) {
-      this.quick = v
-    }
-  },
-  methods: {
-    input(e) {
-      this.$emit("input", this.quick, e)
-    },
-    blur(e) {
-      this.$emit("change", this.quick, e)
-    },
-    keydown(e) {
-      if (e.keyCode === 13) {
-        this.$emit("change", this.quick, e)
-      }
-    }
-  }
-}
-</script>