vue2-client 1.6.1 → 1.6.3

package/CHANGELOG.md

@@ -1,7 +1,10 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.5.25 - 1.6.1 -2022-12-26 @江超**
+**1.6.3 -2022-12-27 @江超**
+- 取消更多条件的抽屉
+
+**1.5.25 - 1.6.2 -2022-12-26 @江超**
 - 解决下拉框表单项刷新时不重新获取数据的问题
 
 **1.5.24 -2022-12-21 @苗艳强**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/common/XForm/XForm.vue

@@ -1,194 +1,180 @@
-<template>
-  <div v-show="visible && realJsonData.length > 0" class="table-page-search-wrapper">
-    <div v-show="advanced" ref="drawerContainer"></div>
-    <a-form-model
-      v-if="loaded"
-      ref="form"
-      :model="form"
-      :rules="rules"
-      layout="inline">
-      <a-row :gutter="48">
-        <x-form-item
-          v-for="(item, index) in realJsonData.slice(0,6)"
-          :key="index"
-          :attr="item"
-          :form="form"
-          :service-name="serviceName"
-          :get-data-params="getDataParams"
-        />
-        <a-drawer
-          :get-container="() => {return $refs.drawerContainer}"
-          :header-style="{ textAlign: 'center' }"
-          :visible="advanced"
-          :wrap-style="{ position: 'absolute' }"
-          placement="top"
-          title="更多条件"
-          @close="onClose"
-        >
-          <a-form-model :model="form" layout="inline">
-            <x-form-item
-              v-for="(item, index) in realJsonData.slice(6)"
-              :key="'advanced'+index"
-              :attr="item"
-              :form="form"
-              :service-name="serviceName"
-              :get-data-params="getDataParams"
-            />
-          </a-form-model>
-        </a-drawer>
-        <a-col>
-          <span
-            :style="advanced && { float: 'right', overflow: 'hidden' } || {} "
-            class="table-page-search-submitButtons">
-            <a-button htmlType="submit" style="margin-left: 8px" type="primary" @click="onSubmit">
-              <a-icon :style="iconStyle" type="search"/>查询
-            </a-button>
-            <a-button style="margin-left: 8px" @click="resetForm">
-              <a-icon :style="iconStyle" type="redo" />重置
-            </a-button>
-            <slot></slot>
-            <a v-if="realJsonData.length > 6" style="margin-left: 8px" @click="toggleAdvanced">
-              更多条件
-              <a-icon type="down"/>
-            </a>
-          </span>
-        </a-col>
-      </a-row>
-    </a-form-model>
-    <div class="next-divider-dashed" role="separator"></div>
-  </div>
-</template>
-<script>
-import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
-
-export default {
-    name: 'XForm',
-    components: {
-      XFormItem
-    },
-    props: {
-      // 调用logic获取数据源的追加参数
-      getDataParams: {
-        type: Object,
-        default: undefined
-      }
-    },
-    data () {
-      return {
-        // 内容加载是否完成
-        loaded: false,
-        // 服务名称
-        serviceName: 'af-system',
-        // 是否展开条件
-        advanced: false,
-        // 表单Model
-        form: undefined,
-        // 校验
-        rules: {},
-        // 图标样式
-        iconStyle: {
-          position: 'relative',
-          top: '1px'
-        },
-        // 表单项集合
-        formItems: [],
-        // 是否显示
-        visible: true
-      }
-    },
-    computed: {
-      // 过滤掉仅用于新增/修改场景的表单项
-      realJsonData: function () {
-        return this.formItems.filter(item => !item.isOnlyAddOrEdit)
-      },
-    },
-    methods: {
-      init (params) {
-        const {
-          formItems, serviceName = 'af-system'
-        } = params
-        this.loaded = false
-        this.formItems = JSON.parse(JSON.stringify(formItems))
-        this.serviceName = serviceName
-        const formData = {}
-        for (let i = 0; i < this.realJsonData.length; i++) {
-          const item = this.realJsonData[i]
-          formData[item.model] = undefined
-          // 处理表单校验情况
-          if (item.rule) {
-            this.rules[item.model] = []
-            switch (item.rule.type) {
-              case 'number':
-              case 'integer':
-              case 'float':
-                let defaultValue
-                let message
-                switch (item.rule.type) {
-                  case 'number':
-                    message = '数字'
-                    defaultValue = 0
-                    break
-                  case 'integer':
-                    message = '整数'
-                    defaultValue = 0
-                    break
-                  case 'float':
-                    message = '小数'
-                    defaultValue = 0.0
-                    break
-                }
-                this.rules[item.model].push({
-                  type: item.rule.type,
-                  message: item.name + '必须为' + message,
-                  transform: (value) => {
-                    if (value && value.length !== 0) {
-                      return Number(value)
-                    } else {
-                      return defaultValue
-                    }
-                  },
-                  trigger: 'blur'
-                })
-                break
-            }
-          }
-        }
-        this.form = formData
-        this.loaded = true
-      },
-      toggleAdvanced () {
-        this.advanced = !this.advanced
-      },
-      toggleVisible () {
-        this.visible = !this.visible
-      },
-      resetForm () {
-        this.$refs.form.resetFields()
-      },
-      onSubmit () {
-        this.$refs.form.validate(valid => {
-          for (const key of Object.keys(this.form)) {
-            if (this.form[key] === null || this.form[key] === '') {
-              this.form[key] = undefined
-            }
-            if (Array.isArray(this.form[key]) && !this.form[key][0]) {
-              this.form[key] = undefined
-            }
-          }
-          const requestParameters = Object.assign({}, this.form)
-          const data = {
-            valid: valid,
-            form: requestParameters
-          }
-          this.$emit('onSubmit', data)
-        })
-      },
-      exports () {
-        this.$emit('exports', this.form)
-      },
-      onClose () {
-        this.advanced = false
-      }
-    }
-  }
-</script>
+<template>
+  <div v-show="visible && realJsonData.length > 0" class="table-page-search-wrapper">
+    <a-form-model
+      v-if="loaded"
+      ref="form"
+      :model="form"
+      :rules="rules"
+      layout="inline">
+      <a-row :gutter="48">
+        <x-form-item
+          v-for="(item, index) in realJsonData.slice(0,6)"
+          :key="index"
+          :attr="item"
+          :form="form"
+          :service-name="serviceName"
+          :get-data-params="getDataParams"
+        />
+        <div v-show="advanced">
+          <x-form-item
+            v-for="(item, index) in realJsonData.slice(6)"
+            :key="'advanced'+index"
+            :attr="item"
+            :form="form"
+            :service-name="serviceName"
+            :get-data-params="getDataParams"
+          />
+        </div>
+        <a-col>
+          <span
+            :style="advanced && { float: 'right', overflow: 'hidden' } || {} "
+            class="table-page-search-submitButtons">
+            <a-button htmlType="submit" style="margin-left: 8px" type="primary" @click="onSubmit">
+              <a-icon :style="iconStyle" type="search"/>查询
+            </a-button>
+            <a-button style="margin-left: 8px" @click="resetForm">
+              <a-icon :style="iconStyle" type="redo" />重置
+            </a-button>
+            <slot></slot>
+            <a v-if="realJsonData.length > 6" style="margin-left: 8px" @click="toggleAdvanced">
+              <span v-show="!advanced">更多条件<a-icon type="down"/></span>
+              <span v-show="advanced">收起更多<a-icon type="up"/></span>
+            </a>
+          </span>
+        </a-col>
+      </a-row>
+    </a-form-model>
+    <div class="next-divider-dashed" role="separator"></div>
+  </div>
+</template>
+<script>
+import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
+
+export default {
+  name: 'XForm',
+  components: {
+    XFormItem
+  },
+  props: {
+    // 调用logic获取数据源的追加参数
+    getDataParams: {
+      type: Object,
+      default: undefined
+    }
+  },
+  data () {
+    return {
+      // 内容加载是否完成
+      loaded: false,
+      // 服务名称
+      serviceName: 'af-system',
+      // 是否展开条件
+      advanced: false,
+      // 表单Model
+      form: undefined,
+      // 校验
+      rules: {},
+      // 图标样式
+      iconStyle: {
+        position: 'relative',
+        top: '1px'
+      },
+      // 表单项集合
+      formItems: [],
+      // 是否显示
+      visible: true
+    }
+  },
+  computed: {
+    // 过滤掉仅用于新增/修改场景的表单项
+    realJsonData: function () {
+      return this.formItems.filter(item => !item.isOnlyAddOrEdit)
+    },
+  },
+  methods: {
+    init (params) {
+      const {
+        formItems, serviceName = 'af-system'
+      } = params
+      this.loaded = false
+      this.formItems = JSON.parse(JSON.stringify(formItems))
+      this.serviceName = serviceName
+      const formData = {}
+      for (let i = 0; i < this.realJsonData.length; i++) {
+        const item = this.realJsonData[i]
+        formData[item.model] = undefined
+        // 处理表单校验情况
+        if (item.rule) {
+          this.rules[item.model] = []
+          switch (item.rule.type) {
+            case 'number':
+            case 'integer':
+            case 'float':
+              let defaultValue
+              let message
+              switch (item.rule.type) {
+                case 'number':
+                  message = '数字'
+                  defaultValue = 0
+                  break
+                case 'integer':
+                  message = '整数'
+                  defaultValue = 0
+                  break
+                case 'float':
+                  message = '小数'
+                  defaultValue = 0.0
+                  break
+              }
+              this.rules[item.model].push({
+                type: item.rule.type,
+                message: item.name + '必须为' + message,
+                transform: (value) => {
+                  if (value && value.length !== 0) {
+                    return Number(value)
+                  } else {
+                    return defaultValue
+                  }
+                },
+                trigger: 'blur'
+              })
+              break
+          }
+        }
+      }
+      this.form = formData
+      this.loaded = true
+    },
+    toggleAdvanced () {
+      this.advanced = !this.advanced
+    },
+    toggleVisible () {
+      this.visible = !this.visible
+    },
+    resetForm () {
+      this.$refs.form.resetFields()
+    },
+    onSubmit () {
+      this.$refs.form.validate(valid => {
+        for (const key of Object.keys(this.form)) {
+          if (this.form[key] === null || this.form[key] === '') {
+            this.form[key] = undefined
+          }
+          if (Array.isArray(this.form[key]) && !this.form[key][0]) {
+            this.form[key] = undefined
+          }
+        }
+        const requestParameters = Object.assign({}, this.form)
+        const data = {
+          valid: valid,
+          form: requestParameters
+        }
+        this.$emit('onSubmit', data)
+      })
+    },
+    exports () {
+      this.$emit('exports', this.form)
+    }
+  }
+}
+</script>