vue2-client 1.2.24 → 1.2.27

package/CHANGELOG.md

@@ -1,6 +1,23 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**##1.2.27 -2022-03-29 @朱子峰**
+- 功能新增：
+- [XAddNativeForm]：将XAddForm从模态框中抽取，用于页面直接展示Form
+
+**##1.2.25 -2022-03-26 @江超**
+- 功能修改：
+- [查询配置生成]：表单[新增/修改场景]增加[version(版本号)]类型
+- [api.js]：移除[跨域代理前缀]
+- 问题修复：
+- [查询配置生成]：修复修改已有查询配置时，部分数据显示状态不一致的问题
+- [设备详情页]：修复设备抄表记录，异常记录查询报错的问题
+- [XFormItem]：修复非懒加载搜索的下拉框显示问题
+
+**##1.2.20 - 1.2.24 -2022-03-25 @朱子峰**
+- 功能修改：
+- [工单关闭/开始处理]：工单关闭和开始处理时，不由id来进行判断，改由姓名进行判断是否为同一个人
+
 **##1.2.17 - 1.2.19 -2022-03-25 @朱子峰**
 - 问题修复：
 - [钉钉消息推送]：将类别字段从int修改为String，直接传字典中的值

package/package.json

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

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

@@ -440,6 +440,7 @@
                       <a-select-option key="add">仅支持新增</a-select-option>
                       <a-select-option key="edit">仅支持修改</a-select-option>
                       <a-select-option key="silenceAdd">静默新增（不生成表单）</a-select-option>
+                      <a-select-option key="version">版本号</a-select-option>
                       <a-popover
                         slot="suffixIcon"
                         title="关于新增/修改场景选择"
@@ -807,7 +808,7 @@ export default {
             }
           }
           // 必选项兼容处理
-          if (columnItem.rule && !isNaN(columnItem.rule.required)) {
+          if (columnItem.rule && columnItem.rule.required && columnItem.rule.required !== 'false') {
             columnItem.rule.required = columnItem.rule.required.toString()
           } else {
             if (!columnItem.rule) {
@@ -815,6 +816,12 @@ export default {
             }
             columnItem.rule.required = 'false'
           }
+          // 数据源加载方式兼容处理
+          if (columnItem.lazyLoad && columnItem.lazyLoad !== 'false') {
+            columnItem.lazyLoad = columnItem.lazyLoad.toString()
+          } else {
+            columnItem.lazyLoad = 'false'
+          }
           // 下拉框数据源兼容处理
           if ((columnItem.formType === 'select' || columnItem.formType === 'cascader') && columnItem.selectKey) {
             // 数据源为logic
@@ -1015,6 +1022,9 @@ export default {
             if (item.selectKey.substring(0, 6) !== 'logic@') {
               item.selectKey = 'logic@' + item.selectKey
             }
+            if (!item.lazyLoad) {
+              delete item.lazyLoad
+            }
           } else if (item.selectType === 'fixArray') {
             // 数据源为固定json集合
             if (!this.isJSON(item.selectKey)) {

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

@@ -492,7 +492,7 @@ export default {
         )
         for (const columnItem of this.form.column) {
           // 必选项兼容处理
-          if (columnItem.rule && !isNaN(columnItem.rule.required)) {
+          if (columnItem.rule && columnItem.rule.required && columnItem.rule.required !== 'false') {
             columnItem.rule.required = columnItem.rule.required.toString()
           } else {
             if (!columnItem.rule) {
@@ -500,6 +500,12 @@ export default {
             }
             columnItem.rule.required = 'false'
           }
+          // 数据源加载方式兼容处理
+          if (columnItem.lazyLoad && columnItem.lazyLoad !== 'false') {
+            columnItem.lazyLoad = columnItem.lazyLoad.toString()
+          } else {
+            columnItem.lazyLoad = 'false'
+          }
           // 下拉框数据源兼容处理
           if ((columnItem.formType === 'select' || columnItem.formType === 'cascader') && columnItem.selectKey) {
             // 数据源为logic
@@ -623,6 +629,9 @@ export default {
           if (item.selectKey.substring(0, 6) !== 'logic@') {
             item.selectKey = 'logic@' + item.selectKey
           }
+          if (!item.lazyLoad) {
+            delete item.lazyLoad
+          }
         } else if (item.selectType === 'fixArray') {
           // 数据源为固定json集合
           if (!this.isJSON(item.selectKey)) {

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

@@ -113,6 +113,12 @@ export default {
           return item.addOrEdit === 'silenceAdd'
         })
       },
+      // 过滤出版本号表单项
+      versionJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit === 'version'
+        })
+      },
       ...mapState('account', { currUser: 'user' })
     },
     props: {
@@ -314,6 +320,14 @@ export default {
             this.form[item.model] = undefined
           }
         }
+        // 追加版本号信息
+        for (const item of this.versionJsonData) {
+          if (!this.modifyModelData[item.model]) {
+            this.form[item.model] = 0
+          } else {
+            this.form[item.model] = this.modifyModelData[item.model] + ''
+          }
+        }
       },
       onClose () {
         this.$emit('update:visible', false)

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

@@ -0,0 +1,315 @@
+<template>
+  <div class="table-page-search-wrapper">
+    <a-form-model
+      v-if="loaded"
+      ref="selectForm"
+      :model="form"
+      :rules="rules">
+      <a-row :gutter="16">
+        <x-form-item
+          v-for="(item, index) in realJsonData"
+          mode="新增/修改"
+          :attr="item"
+          :form="form"
+          :key="index"
+          :disabled="itemDisabled(item)"
+          :xl="12"
+          :xxl="8"
+        />
+        <div v-for="group in realJsonSelectsData" :key="group[0].group">
+          <x-form-col v-for="groupItem in group" :key="groupItem.group + groupItem.groupIndex" :xl="12" :xxl="8">
+            <a-form-model-item :label="groupItem.name" :disabled="itemDisabled(groupItem)">
+              <a-select v-model="form[groupItem.model]" :disabled="itemDisabledPlus(groupItem.group,groupItem.groupIndex)" :allowClear="true" @change="selectsItemCheck(groupItem.group,groupItem.groupIndex,form[groupItem.model],group)" placeholder="请选择">
+                <template v-for="option in SelectsArray[groupItem.group][groupItem.groupIndex]">
+                  <a-select-option :key="option.label" :value="option.value">
+                    {{ option.label }}
+                  </a-select-option>
+                </template>
+              </a-select>
+            </a-form-model-item>
+          </x-form-col>
+        </div>
+      </a-row>
+    </a-form-model>
+  </div>
+</template>
+<script>
+import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
+import { formatDate } from '@vue2-client/utils/util'
+import { mapState } from 'vuex'
+import { post } from '@vue2-client/services/api/restTools'
+
+export default {
+    name: 'XAddNativeForm',
+    components: {
+      XFormItem
+    },
+    data () {
+      return {
+        // 内容加载是否完成
+        loaded: false,
+        // 表单Model
+        form: undefined,
+        // 多层下拉框组 数据储存
+        SelectsArray: {},
+        // 多层下拉框组 各组数量
+        SelectsNumber: {},
+        // 校验
+        rules: {},
+        // 图标样式
+        iconStyle: {
+          position: 'relative',
+          top: '1px'
+        }
+      }
+    },
+    computed: {
+      // 过滤出用于新增/修改场景的表单项
+      realJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && !item.group
+        })
+      },
+      // 过滤出多个下拉框分组级联得数据
+      realJsonSelectsData: function () {
+        const Selectsata = this.jsonData.filter(item => !item.isOnlyAddOrEdit && item.group)
+        const groupName = [...new Set(Selectsata.map(item => item.group))]
+        // 初始化数据组
+        groupName.forEach(item => {
+          this.SelectsArray[item] = []
+        })
+        return groupName.map(groupName => {
+          const SelectsItem = Selectsata.filter(item => {
+              if (item.groupIndex === 1) {
+                if (item.keyName.substring(0, 6) === 'logic@') {
+                  // 请求logic
+                  post('/webmeterapi/' + item.keyName.substring(6), {}).then(res => {
+                    this.SelectsArray[item.group][item.groupIndex] = res
+                  })
+                } else {
+                  this.SelectsArray[item.group][item.groupIndex] = JSON.parse(item.keyName)
+                }
+              }
+              return item.group === groupName
+            }
+          )
+          this.SelectsNumber[groupName] = SelectsItem.length ? SelectsItem.length : 0
+          return SelectsItem
+        })
+      },
+      // 过滤出用于静默新增场景的表单项
+      silenceAddJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit === 'silenceAdd'
+        })
+      },
+      // 过滤出版本号表单项
+      versionJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit === 'version'
+        })
+      },
+      ...mapState('account', { currUser: 'user' })
+    },
+    props: {
+      jsonData: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      // 业务类型
+      businessType: {
+        type: String,
+        default: ''
+      },
+      // 修改操作前查询出的业务数据
+      modifyModelData: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      },
+      // 新增或修改业务是否执行中
+      loading: {
+        type: Boolean,
+        default: () => {
+          return false
+        }
+      },
+      // 固定新增表单
+      fixedAddForm: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    watch: {
+      visible (rel) {
+        if (rel) {
+          this.formItemLoad()
+        }
+      }
+    },
+    mounted () {
+      this.formItemLoad()
+    },
+    methods: {
+      selectsItemCheck (groupName, index, value, group) {
+        const tem = { }
+        // 获取当前下拉框子下拉框的数据
+        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] = []
+        }
+      },
+      formItemLoad () {
+        const formData = Object.assign({}, this.fixedAddForm)
+        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] = []
+            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
+        if (Object.keys(this.modifyModelData).length > 0) {
+          this.getModifyModelData()
+        }
+        this.loaded = true
+      },
+      itemDisabled (value) {
+        return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
+          (this.businessType === '修改' && value.addOrEdit === 'add')
+      },
+      itemDisabledPlus (group, index) {
+        return (!this.SelectsArray[group][index]) || (this.SelectsArray[group][index] && this.SelectsArray[group][index].length === 0)
+      },
+      resetForm () {
+        this.$refs.selectForm.resetFields()
+      },
+      async onSubmit () {
+        this.$refs.selectForm.validate(async valid => {
+          for (const key of Object.keys(this.form)) {
+            if (this.form[key] === null || this.form[key] === '') {
+              this.form[key] = undefined
+            }
+          }
+          const requestParameters = Object.assign({}, this.form)
+          // 追加静默新增字段
+          if (this.businessType === '新增') {
+            for (const item of this.silenceAddJsonData) {
+              switch (item.silencePurpose) {
+                case 'createTime':
+                  requestParameters[item.model] = formatDate('now')
+                  break
+                case 'operator':
+                  requestParameters[item.model] = this.currUser.name
+                  break
+                case 'orgId':
+                  requestParameters[item.model] = this.currUser.orgid
+                  break
+              }
+            }
+            // 通过请求追加静默新增：自定义字段
+            for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
+              requestParameters[item.model] = await this.getSilenceSource(item.silenceSource, requestParameters)
+            }
+          }
+          const data = {
+            valid: valid,
+            form: requestParameters
+          }
+          this.$emit('onSubmit', data)
+        })
+      },
+      async getSilenceSource (silenceSource, requestParameters) {
+        const result = await post('/webmeterapi/' + silenceSource, requestParameters)
+        return result
+      },
+      getModifyModelData () {
+        for (let i = 0; i < this.realJsonData.length; i++) {
+          const item = this.realJsonData[i]
+          if (this.modifyModelData[item.model] || this.modifyModelData[item.model] === 0) {
+            this.form[item.model] = this.modifyModelData[item.model] + ''
+          } else {
+            this.form[item.model] = undefined
+          }
+        }
+        // 追加版本号信息
+        for (const item of this.versionJsonData) {
+          if (!this.modifyModelData[item.model]) {
+            this.form[item.model] = 0
+          } else {
+            this.form[item.model] = this.modifyModelData[item.model] + ''
+          }
+        }
+      },
+      onClose () {
+        this.$emit('update:visible', false)
+      }
+    }
+  }
+</script>

package/src/base-client/components/common/XAddNativeForm/index.js

@@ -0,0 +1,3 @@
+import XAddNativeForm from './XAddNativeForm'
+
+export default XAddNativeForm

package/src/base-client/components/common/XAddNativeForm/index.md

@@ -0,0 +1,56 @@
+# XAddNativeForm
+
+动态新增/修改表单控件，根据JSON配置生成一个完整的可供新增/修改数据的动态表单
+
+
+## 何时使用
+
+当需要一个可供新增/修改数据的动态生成的表单时
+
+
+引用方式：
+
+```javascript
+import XAddNativeForm from '@vue2-client/base-client/components/XAddNativeForm/XAddNativeForm'
+
+export default {
+    components: {
+      XAddNativeForm
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<x-add-form
+  :business-type="businessType"
+  :json-data="formItems"
+  :modify-model-data="modifyModelData"
+  :loading="loading"
+  @onSubmit="onSubmit">
+</x-add-form>
+```
+
+## API
+
+| 参数              | 说明                       | 类型      | 默认值   |
+|-----------------|--------------------------|---------|-------|
+| businessType    | 业务类型                     | String  | ''    |
+| jsonData        | JSON配置，根据[工具>查询配置生成]功能生成 | Object  | {}    |
+| modifyModelData | 修改操作前查询出的业务数据            | Object  | {}    |
+| loading         | 新增或修改业务是否执行中             | Boolean | false |
+| fixedAddForm    | 固定新增表单，会和新增表单合并          | Object  | {}    |
+| @onSubmit       | 表单的提交事件                  | event   | -     |
+
+## 例子1
+----
+参考XFormTable组件
+```
+
+注意事项
+----
+
+> 本组件已经实现了自适应布局，在不同分辨率下的设备均可得到基本理想的展示效果

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

@@ -44,7 +44,7 @@
       :label="attr.name"
       :prop="attr.model">
       <a-select
-        v-if="!attr.lazyLoad"
+        v-if="!attr.lazyLoad || attr.lazyLoad === 'false'"
         v-model="form[attr.model]"
         :disabled="disabled"
         show-search
@@ -216,7 +216,7 @@ export default {
     }
   },
   created () {
-    if (!this.attr.lazyLoad && this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {
+    if ((!this.attr.lazyLoad || this.attr.lazyLoad === 'false') && this.attr.keyName && this.attr.keyName.indexOf('logic@') !== -1) {
       this.getData({}, res => {
         this.option = res
       })

package/src/base-client/components/iot/DataAnalysisViewGD/DataAnalysisViewGD.vue

@@ -542,6 +542,7 @@
       .ant-layout-sider-zero-width-trigger {
         top: 50%;
         background-color: @shadow-color;
+        z-index: 9999;
       }
     }
   }

package/src/base-client/components/iot/DeviceDetailsView/DeviceDetailsView.vue

@@ -45,9 +45,9 @@
           </a-tabs>
           <div v-if="!loadDeviceDetails">
             <device-details-main :details="details" v-if="tabActiveKey === '1'"/>
-            <device-details-read :device-no="details.f_device_no" :device-id="details.id" v-if="tabActiveKey === '2'"/>
+            <device-details-read :device-id="details.id" v-if="tabActiveKey === '2'"/>
             <device-details-instruct :device-no="details.f_device_no" v-if="tabActiveKey === '3'"/>
-            <device-details-singular :device-no="details.f_device_no" v-if="tabActiveKey === '4'"/>
+            <device-details-singular :device-id="details.id" v-if="tabActiveKey === '4'"/>
             <device-details-instruct-operate :device="details" v-if="tabActiveKey === '5'"/>
           </div>
         </template>

package/src/base-client/components/iot/DeviceDetailsView/part/DeviceDetailsException.vue

@@ -31,8 +31,8 @@
       }
     },
     props: {
-      deviceNo: {
-        type: String,
+      deviceId: {
+        type: Number,
         required: true
       }
     },
@@ -42,10 +42,10 @@
     methods: {
       initView () {
         this.tabActiveKey = '1'
-        this.fixedQueryForm['e_f_device_id'] = this.deviceNo
+        this.fixedQueryForm['e_f_device_id'] = this.deviceId
       },
       onSubmit (res) {
-        res.form['e_f_device_id'] = this.deviceNo
+        res.form['e_f_device_id'] = this.deviceId
         this.$emit('onSubmit', res)
       },
       toDetail (record, id) {

package/src/base-client/components/iot/DeviceDetailsView/part/DeviceDetailsRead.vue

@@ -23,10 +23,6 @@
       XFormTable
     },
     props: {
-      deviceNo: {
-        type: String,
-        required: true
-      },
       deviceId: {
         type: Number,
         required: true
@@ -68,12 +64,12 @@
     methods: {
       initView () {
         this.logicParam = {
-          id: this.deviceNo
+          id: this.deviceId
         }
-        this.fixedQueryForm['i_id'] = this.deviceId
+        this.fixedQueryForm['d_id'] = this.deviceId
       },
       onSubmit (res) {
-        res.form['i_id'] = this.deviceId
+        res.form['d_id'] = this.deviceId
         this.$emit('onSubmit', res)
       },
       refresh () {

package/src/services/api.js

@@ -1,11 +1,11 @@
 // 跨域代理前缀
 // const API_PROXY_PREFIX='/api'
 // const BASE_URL = process.env.NODE_ENV === 'production' ? process.env.VUE_APP_API_BASE_URL : API_PROXY_PREFIX
-const BASE_URL = process.env.VUE_APP_API_BASE_URL
+
 module.exports = {
-  LOGIN: `${BASE_URL}/rs/logic/getLogin`,
-  ROUTES: `${BASE_URL}/rs/user/userLogin/智慧燃气`,
-  SEARCH: `${BASE_URL}/rs/search`,
-  GOODS: `${BASE_URL}/goods`,
-  GOODS_COLUMNS: `${BASE_URL}/columns`
+  LOGIN: `/rs/logic/getLogin`,
+  ROUTES: `/rs/user/userLogin/智慧燃气`,
+  SEARCH: `/rs/search`,
+  GOODS: `/goods`,
+  GOODS_COLUMNS: `/columns`
 }

package/src/utils/request.js

@@ -113,9 +113,10 @@ function loadInterceptors () {
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
       config.headers['Access-Token'] = token
+      config.headers['Cookie'] = Cookie
     }
     if (!config.headers['Content-Type']) {
-      config.headers['Content-Type'] = 'application/json;charset=UTF-8'
+      config.headers['Content-Type'] = 'application/json/x-www-form-urlencoded;charset=UTF-8'
     }
     return config
   }, errorHandler)

package/src/utils/routerUtil.js

@@ -1,3 +1,4 @@
+import Vue from 'vue'
 import routerMap from '@vue2-client/router/async/router.map'
 import { mergeI18nFromRoutes } from '@vue2-client/utils/i18n'
 import Router from 'vue-router'
@@ -135,6 +136,11 @@ function loadRoutes (routesConfig) {
   // 应用配置
   const { router, store, i18n } = appOptions
 
+  // 刷新页面时,有些全局状态丢失,在此处从本地缓存拿出来赋值
+  if (JSON.stringify(Vue.$login.f) == '{}') {
+    const login = store.getters['account/login']
+    Object.assign(Vue.$login, login)
+  }
   // 如果 routesConfig 有值，则更新到本地，否则从本地获取
   if (routesConfig) {
     store.commit('account/setRoutesConfig', routesConfig)