vue2-client 1.4.62 → 1.4.64

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

@@ -1,274 +1,274 @@
-<template>
-  <div v-show="isShow" class="table-page-search-wrapper">
-    <div v-show="advanced" ref="drawerContainer"></div>
-    <a-form-model
-      v-if="loaded"
-      ref="selectForm"
-      :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"
-          :selects-array="SelectsArray"
-          :service-name="serviceName"
-          @selectsItemCheck="selectsItemCheck"
-        />
-        <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"
-              :selectsArray="SelectsArray"
-              :service-name="serviceName"
-              @selectsItemCheck="selectsItemCheck"
-            />
-          </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="jsonData.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'
-import { post } from '@vue2-client/services/api'
-
-export default {
-    name: 'XForm',
-    components: {
-      XFormItem
-    },
-    data () {
-      return {
-        // 内容加载是否完成
-        loaded: false,
-        // 是否展开条件
-        advanced: false,
-        // 表单Model
-        form: undefined,
-        // 多层下拉框组 数据储存
-        SelectsArray: {},
-        // 多层下拉框组 各组数量
-        SelectsNumber: {},
-        // 校验
-        rules: {},
-        // 图标样式
-        iconStyle: {
-          position: 'relative',
-          top: '1px'
-        }
-      }
-    },
-    computed: {
-      // 过滤掉仅用于新增/修改场景的表单项  以及多个下拉框得组
-      realJsonData: function () {
-        return this.jsonData.filter(item => !item.isOnlyAddOrEdit)
-      },
-    },
-    props: {
-      jsonData: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      isExports: {
-        type: Boolean,
-        default: () => {
-          return true
-        }
-      },
-      isShow: {
-        type: Boolean,
-        default: () => {
-          return true
-        }
-      },
-      serviceName: {
-        type: String,
-        default: 'af-system'
-      }
-    },
-    mounted () {
-      this.formItemLoad()
-      this.getSelectsArray()
-    },
-    methods: {
-      // 初始化级联框数据
-      getSelectsArray () {
-        const selectSate = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
-        const groupName = [...new Set(selectSate.map(item => item.group))]
-        // 初始化数据组
-        groupName.forEach(groupName => {
-            this.SelectsArray[groupName] = []
-            const SelectsItem = selectSate.filter(item => {
-                if (item.groupIndex === 1) {
-                  if (item.keyName.substring(0, 6) === 'logic@') {
-                    // 请求logic
-                    post('/api/' + this.serviceName + '/logic/' + item.keyName.substring(6), {}).then(res => {
-                      this.SelectsArray[item.group][item.groupIndex] = res
-                      this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
-                    })
-                  } else {
-                    this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
-                    this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
-                  }
-                }
-                return item.group === groupName
-              }
-            )
-            this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
-          }
-        )
-        this.loaded = true
-      },
-      selectsItemCheck (callback, groupName, index, value) {
-        const tem = { }
-        const group = this.realJsonData.filter(item => !item.isOnlyAddOrEdit && item.group && item.group === groupName)
-        // 获取当前下拉框子下拉框的数据
-        this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
-        // 清空子下拉框的子们的数据
-        for (let i = index; i < this.SelectsNumber[groupName]; i++) {
-          tem[group[i].model] = undefined
-        }
-        this.form = Object.assign({}, this.form, tem)
-        // 清空子下拉框的子们的数据源
-        for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
-          this.SelectsArray[groupName][i] = []
-        }
-        callback(this.SelectsArray)
-      },
-      formItemLoad () {
-        const formData = {}
-        for (let i = 0; i < this.realJsonData.length; i++) {
-          const item = this.realJsonData[i]
-          formData[item.model] = undefined
-          if (item.keys && item.model === 'rowIdValue' && item.keys.length > 0) {
-            // 处理综合筛选下拉框默认值情况
-            formData.rowIdName = Object.keys(item.keys[0])[0]
-          }
-          // 处理表单校验情况
-          if (item.rule) {
-            this.rules[item.model] = []
-            // const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
-            // let trigger
-            // let message
-            // if (required) {
-            //   switch (item.type) {
-            //     case 'select':
-            //       message = '请选择' + item.name
-            //       trigger = 'change'
-            //       break
-            //     default:
-            //       message = '请输入' + item.name
-            //       trigger = 'blur'
-            //   }
-            //   this.rules[item.model].push({
-            //     required: true,
-            //     message: message,
-            //     trigger: trigger
-            //   })
-            // }
-
-            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
-      },
-      toggleAdvanced () {
-        this.advanced = !this.advanced
-      },
-      resetForm () {
-        this.$refs.selectForm.resetFields()
-      },
-      onSubmit () {
-        this.$refs.selectForm.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="isShow" class="table-page-search-wrapper">
+    <div v-show="advanced" ref="drawerContainer"></div>
+    <a-form-model
+      v-if="loaded"
+      ref="selectForm"
+      :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"
+          :selects-array="SelectsArray"
+          :service-name="serviceName"
+          @selectsItemCheck="selectsItemCheck"
+        />
+        <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"
+              :selectsArray="SelectsArray"
+              :service-name="serviceName"
+              @selectsItemCheck="selectsItemCheck"
+            />
+          </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="jsonData.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'
+import { post } from '@vue2-client/services/api'
+
+export default {
+    name: 'XForm',
+    components: {
+      XFormItem
+    },
+    data () {
+      return {
+        // 内容加载是否完成
+        loaded: false,
+        // 是否展开条件
+        advanced: false,
+        // 表单Model
+        form: undefined,
+        // 多层下拉框组 数据储存
+        SelectsArray: {},
+        // 多层下拉框组 各组数量
+        SelectsNumber: {},
+        // 校验
+        rules: {},
+        // 图标样式
+        iconStyle: {
+          position: 'relative',
+          top: '1px'
+        }
+      }
+    },
+    computed: {
+      // 过滤掉仅用于新增/修改场景的表单项  以及多个下拉框得组
+      realJsonData: function () {
+        return this.jsonData.filter(item => !item.isOnlyAddOrEdit)
+      },
+    },
+    props: {
+      jsonData: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      isExports: {
+        type: Boolean,
+        default: () => {
+          return true
+        }
+      },
+      isShow: {
+        type: Boolean,
+        default: () => {
+          return true
+        }
+      },
+      serviceName: {
+        type: String,
+        default: 'af-system'
+      }
+    },
+    mounted () {
+      this.formItemLoad()
+      this.getSelectsArray()
+    },
+    methods: {
+      // 初始化级联框数据
+      getSelectsArray () {
+        const selectSate = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
+        const groupName = [...new Set(selectSate.map(item => item.group))]
+        // 初始化数据组
+        groupName.forEach(groupName => {
+            this.SelectsArray[groupName] = []
+            const SelectsItem = selectSate.filter(item => {
+                if (item.groupIndex === 1) {
+                  if (item.keyName.substring(0, 6) === 'logic@') {
+                    // 请求logic
+                    post('/api/' + this.serviceName + '/logic/' + item.keyName.substring(6), {}).then(res => {
+                      this.SelectsArray[item.group][item.groupIndex] = res
+                      this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
+                    })
+                  } else {
+                    this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
+                    this.SelectsArray = JSON.parse(JSON.stringify(this.SelectsArray))
+                  }
+                }
+                return item.group === groupName
+              }
+            )
+            this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
+          }
+        )
+        this.loaded = true
+      },
+      selectsItemCheck (callback, groupName, index, value) {
+        const tem = { }
+        const group = this.realJsonData.filter(item => !item.isOnlyAddOrEdit && item.group && item.group === groupName)
+        // 获取当前下拉框子下拉框的数据
+        this.SelectsArray[groupName][index + 1] = this.SelectsArray[groupName][index].filter(item => item.value === value)[0].children
+        // 清空子下拉框的子们的数据
+        for (let i = index; i < this.SelectsNumber[groupName]; i++) {
+          tem[group[i].model] = undefined
+        }
+        this.form = Object.assign({}, this.form, tem)
+        // 清空子下拉框的子们的数据源
+        for (let i = index + 2; i <= this.SelectsNumber[groupName]; i++) {
+          this.SelectsArray[groupName][i] = []
+        }
+        callback(this.SelectsArray)
+      },
+      formItemLoad () {
+        const formData = {}
+        for (let i = 0; i < this.realJsonData.length; i++) {
+          const item = this.realJsonData[i]
+          formData[item.model] = undefined
+          if (item.keys && item.model === 'rowIdValue' && item.keys.length > 0) {
+            // 处理综合筛选下拉框默认值情况
+            formData.rowIdName = Object.keys(item.keys[0])[0]
+          }
+          // 处理表单校验情况
+          if (item.rule) {
+            this.rules[item.model] = []
+            // const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
+            // let trigger
+            // let message
+            // if (required) {
+            //   switch (item.type) {
+            //     case 'select':
+            //       message = '请选择' + item.name
+            //       trigger = 'change'
+            //       break
+            //     default:
+            //       message = '请输入' + item.name
+            //       trigger = 'blur'
+            //   }
+            //   this.rules[item.model].push({
+            //     required: true,
+            //     message: message,
+            //     trigger: trigger
+            //   })
+            // }
+
+            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
+      },
+      toggleAdvanced () {
+        this.advanced = !this.advanced
+      },
+      resetForm () {
+        this.$refs.selectForm.resetFields()
+      },
+      onSubmit () {
+        this.$refs.selectForm.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>

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

@@ -514,6 +514,7 @@ export default {
       if (this.attr.queryType === 'RIGHT_LIKE') {
         // 获取可用于模糊查询的组织机构字符串
         let node = extra.triggerNode.$parent
+        label = label[0]
         while (node && node.label) {
           label = node.label + '.' + label
           node = node.$parent