feat: end

Liberty-liu · May 19, 2023 · 8cfe674 · 8cfe674
1 parent 37374cc
commit 8cfe674
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 16 deletions.
diff --git a/examples/views/filter.vue b/examples/views/filter.vue
@@ -186,7 +186,7 @@ const handleLang = (val) => {
     :isFetchOptions="!isShowValidateState"
     :isShowValidateState="!isShowValidateState"
     :options="defaultOptions"
-    :getOptions="isShowValidateState ? getOptions : ''"
+    :getOptions="isShowValidateState ? getOptions : undefined"
     :getConditions="getConditions"
     :type="state.type"
     ref="ERfilterRef"/>

diff --git a/package.json b/package.json
@@ -1,13 +1,25 @@
 {
   "name": "everright-filter",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "files": [
     "dist"
   ],
+  "license": "SEE LICENSE IN LICENSE",
+  "keywords": [
+    "everright",
+    "everright-filter"
+  ],
   "type": "module",
-  "main": "dist/Everright-filter.umd.cjs",
-  "module": "dist/Everright-filter.js",
-  "style": "dist/style.css",
+  "main": "./dist/Everright-filter.umd.cjs",
+  "module": "./dist/Everright-filter.js",
+  "style": "./dist/style.css",
+  "exports": {
+    ".": {
+      "import": "./dist/Everright-filter.js",
+      "require": "./dist/Everright-filter.umd.cjs"
+    },
+    "./dist/style.css": "./dist/style.css"
+  },
   "scripts": {
     "dev:server": "nodemon server --watch server",
     "dev": "vite --host 0.0.0.0 --port 5174",

diff --git a/packages/filter/Item.vue b/packages/filter/Item.vue
@@ -50,12 +50,17 @@ const {
   ruleRef
 })
 const addRule = () => {
-  state.rules.push(...utils.generateItems(1))
+  if (ER.props.canAddRule() !== false) {
+    state.rules.push(...utils.generateItems(1))
+  }
 }
 defineExpose({
   getData,
   setData,
-  addRule
+  addRule () {
+    state.rules.push(...utils.generateItems(1))
+  },
+  state
 })
 const operatorHeight = ref('auto')
 const callback = (mutationsList) => {
@@ -115,7 +120,7 @@ const itemLabel = computed(() => {
           />
         </TransitionGroup>
         <el-button
-          v-if="ER.state.isShowAdd"
+          v-if="isInConstraint ? true : ER.isShowAdd.value"
           :class="[ns.e('add')]"
           @click="addRule"
           link

diff --git a/packages/filter/components/Trigger.vue b/packages/filter/components/Trigger.vue
@@ -31,6 +31,9 @@ const handleChange = (val) => {
 defineExpose({
   ref: element
 })
+const filterMethod = (node, keyword) => {
+  return node.text.toLowerCase().includes(keyword.toLowerCase())
+}
 </script>
 <template>
   <el-cascader
@@ -39,6 +42,7 @@ defineExpose({
     :checkStrictly="true"
     :model-value="modelValue"
     filterable
+    :filter-method="filterMethod"
     @change="handleChange"
     :props="{
         emitPath: false

diff --git a/packages/filter/index.vue b/packages/filter/index.vue
@@ -36,16 +36,24 @@ const props = defineProps({
     default: 'zh-cn'
   },
   getOptions: {
-    type: [Function, String]
+    type: Function
   },
   getConditions: {
-    type: [Function, String]
+    type: Function
   },
   getProps: {
-    type: [Function, String]
+    type: Function
   },
   getPropValues: {
-    type: [Function, String]
+    type: Function
+  },
+  canAddRule: {
+    type: Function,
+    default: () => {}
+  },
+  ruleLimit: {
+    type: Number,
+    default: -1
   }
 })
 const {
@@ -108,12 +116,17 @@ const fireEvent = (type, data) => {
     })
   }
 }
+const isShowAdd = computed(() => {
+  // console.log(_.flatten(_.get(itemRef, 'value', []).map(e => e.state.rules)).length)
+  return state.isShowAdd && props.ruleLimit === -1 ? true : _.flatten(_.get(itemRef, 'value', []).map(e => e.state.rules)).length < props.ruleLimit
+})
 provide('Everright', {
   state,
   api,
   readied,
   props,
-  fireEvent
+  fireEvent,
+  isShowAdd
 })
 const flatNodes = (nodes) => {
   return nodes.reduce((res, node) => {
@@ -244,7 +257,7 @@ const addGroupLabel = computed(() => {
           </Item>
         </TransitionGroup>
         <el-button
-          v-if="state.isShowAdd"
+          v-if="isShowAdd"
           :class="[ns.e('add')]"
           @click="addItem"
           link

diff --git a/packages/filter/types/Cascader.vue b/packages/filter/types/Cascader.vue
@@ -115,11 +115,15 @@ const componentProps = computed(() => {
   }
   return _.merge(result, _.get(props, 'params.customProps', {}))
 })
+const filterMethod = (node, keyword) => {
+  return node.text.toLowerCase().includes(keyword.toLowerCase())
+}
 </script>
 <template>
   <div
     v-loading="state.loading">
     <el-cascader
+      :filter-method="filterMethod"
       v-model="state.value0" :options="state.options"
       v-if="state.isChanged"
       collapseTagsTooltip

diff --git a/packages/filter/types/Region.vue b/packages/filter/types/Region.vue
@@ -53,6 +53,7 @@ defineExpose({
     v-if="state.isChanged"
     v-model="state.value0"
     :multiple="isMultiple"
+    :selectType="props.params.selectType"
     clearable
     :placeholder="t('er.public.select')"
     ref="erRegin"/>

diff --git a/packages/region/index.vue b/packages/region/index.vue
@@ -19,14 +19,18 @@ const props = defineProps({
   },
   modelValue: {
     type: Array
+  },
+  selectType: {
+    type: Number,
+    default: 3
   }
 })
 const emit = defineEmits(['update:modelValue', 'change'])
 let inputInitialHeight = 0
 const pressDeleteCount = 0
 const region = new Region(areaList, {
-  isFilter: true,
-  selectType: 3
+  isFilter: false,
+  selectType: props.selectType
 })
 const tooltipRef = ref()
 const tagWrapper = ref()

diff --git a/server/routes/Filter/options.js b/server/routes/Filter/options.js
@@ -43,6 +43,7 @@ export default (req, res) => {
               operatorKey: 'Gender',
               value: 'Region',
               multiple: false
+              // selectType: 1 default 3
             },
             {
               label: '文本',