vue2-client 1.2.25 → 1.2.28-test

package/.eslintrc.js

@@ -1,81 +1,82 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true
-  },
-  'extends': [
-    'plugin:vue/essential',
-    'plugin:vue/strongly-recommended',
-    '@vue/standard'
-  ],
-  rules: {
-    'no-console': 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'generator-star-spacing': 'off',
-    'no-mixed-operators': 0,
-    'vue/max-attributes-per-line': [
-      2,
-      {
-        'singleline': 5,
-        'multiline': {
-          'max': 1,
-          'allowFirstLine': false
-        }
-      }
-    ],
-    'vue/attribute-hyphenation': 0,
-    'vue/html-self-closing': 0,
-    'vue/component-name-in-template-casing': 0,
-    'vue/html-closing-bracket-spacing': 0,
-    'vue/singleline-html-element-content-newline': 0,
-    'vue/no-unused-components': 0,
-    'vue/multiline-html-element-content-newline': 0,
-    'vue/no-use-v-if-with-v-for': 0,
-    'vue/html-closing-bracket-newline': 0,
-    'vue/no-parsing-error': 0,
-    'vue/name-property-casing': 0,
-    'no-tabs': 0,
-    'quotes': [
-      2,
-      'single',
-      {
-        'avoidEscape': true,
-        'allowTemplateLiterals': true
-      }
-    ],
-    'semi': [
-      2,
-      'never',
-      {
-        'beforeStatementContinuationChars': 'never'
-      }
-    ],
-    'no-delete-var': 2,
-    'prefer-const': [
-      2,
-      {
-        'ignoreReadBeforeAssign': false
-      }
-    ],
-    'template-curly-spacing': 'off',
-    'indent': 'off',
-    // 必须使用全等: false
-    'eqeqeq': 0,
-    // 可以使用!! 双重否定
-    'no-extra-boolean-cast': 'off'
-  },
-  parserOptions: {
-    parser: 'babel-eslint'
-  },
-  overrides: [
-    {
-      files: [
-        '**/__tests__/*.{j,t}s?(x)',
-        '**/tests/unit/**/*.spec.{j,t}s?(x)'
-      ],
-      env: {
-        jest: true
-      }
-    }
-  ]
-}
+module.exports = {
+  root: true,
+  env: {
+    node: true
+  },
+  'extends': [
+    'plugin:vue/essential',
+    'plugin:vue/strongly-recommended',
+    '@vue/standard'
+  ],
+  rules: {
+    'comma-dangle': 'off',
+    'no-console': 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'generator-star-spacing': 'off',
+    'no-mixed-operators': 0,
+    'vue/max-attributes-per-line': [
+      2,
+      {
+        'singleline': 5,
+        'multiline': {
+          'max': 1,
+          'allowFirstLine': false
+        }
+      }
+    ],
+    'vue/attribute-hyphenation': 0,
+    'vue/html-self-closing': 0,
+    'vue/component-name-in-template-casing': 0,
+    'vue/html-closing-bracket-spacing': 0,
+    'vue/singleline-html-element-content-newline': 0,
+    'vue/no-unused-components': 0,
+    'vue/multiline-html-element-content-newline': 0,
+    'vue/no-use-v-if-with-v-for': 0,
+    'vue/html-closing-bracket-newline': 0,
+    'vue/no-parsing-error': 0,
+    'vue/name-property-casing': 0,
+    'no-tabs': 0,
+    'quotes': [
+      2,
+      'single',
+      {
+        'avoidEscape': true,
+        'allowTemplateLiterals': true
+      }
+    ],
+    'semi': [
+      2,
+      'never',
+      {
+        'beforeStatementContinuationChars': 'never'
+      }
+    ],
+    'no-delete-var': 2,
+    'prefer-const': [
+      2,
+      {
+        'ignoreReadBeforeAssign': false
+      }
+    ],
+    'template-curly-spacing': 'off',
+    'indent': 'off',
+    // 必须使用全等: false
+    'eqeqeq': 0,
+    // 可以使用!! 双重否定
+    'no-extra-boolean-cast': 'off'
+  },
+  parserOptions: {
+    parser: 'babel-eslint'
+  },
+  overrides: [
+    {
+      files: [
+        '**/__tests__/*.{j,t}s?(x)',
+        '**/tests/unit/**/*.spec.{j,t}s?(x)'
+      ],
+      env: {
+        jest: true
+      }
+    }
+  ]
+}

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**##1.2.28 -2022-03-29 @朱子峰**
+- 功能修改：
+- [Cookie]：去除自定义Cookie
+
+**##1.2.27 -2022-03-29 @朱子峰**
+- 功能新增：
+- [XAddNativeForm]：将XAddForm从模态框中抽取，用于页面直接展示Form
+
 **##1.2.25 -2022-03-26 @江超**
 - 功能修改：
 - [查询配置生成]：表单[新增/修改场景]增加[version(版本号)]类型

package/package.json

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

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

@@ -307,7 +307,7 @@
                 <a-col :span="8" v-if="item.groupIndex !== 1">
                   <a-form-model-item label="数据所属节点" prop="groupIndex">
                     <a-select v-model="item.parent_title" placeholder="请选择父节点" ref="groupIndex" @change="parent_title_change">
-                      <a-select-option v-for="item in parent_node" :key="item.key">{{ item.title }}</a-select-option>
+                      <a-select-option v-for="parent_item in parent_node" :key="parent_item.key">{{ parent_item.title }}</a-select-option>
                       <a-popover slot="suffixIcon" title="关于父节点" placement="bottom">
                         <template slot="content">
                           <p>多个下拉框为一组时，需要首先选择的为父节点</p>
@@ -596,8 +596,7 @@ import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
 import { queryType } from '@/config/CreateQueryConfig'
 import { mapState } from 'vuex'
-import { post } from '@vue2-client/services/api/restTools'
-import { commonApi } from '@vue2-client/services/api/common'
+import { commonApi, post } from '@vue2-client/services/api'
 const DemoJson = [{ value: 'zhejiang', label: 'Zhejiang', children: [{ value: 'hangzhou', label: 'Hangzhou', children: [{ value: 'xihu', label: 'West Lake' }] }] }]
 export default {
   name: 'CreateQuery',

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

@@ -400,8 +400,7 @@ import JsonViewer from 'vue-json-viewer'
 import FileSaver from 'file-saver'
 import { queryType } from '@/config/CreateQueryConfig'
 import { mapState } from 'vuex'
-import { post } from '@vue2-client/services/api/restTools'
-import { commonApi } from '@vue2-client/services/api/common'
+import { commonApi, post } from '@vue2-client/services/api'
 const DemoJson = [{ value: 'zhejiang', label: 'Zhejiang', children: [{ value: 'hangzhou', label: 'Hangzhou', children: [{ value: 'xihu', label: 'West Lake' }] }] }]
 export default {
   name: 'CreateSimpleFormQuery',

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

@@ -34,8 +34,7 @@
 <script>
 import { mapState } from 'vuex'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
-import { commonApi } from '@vue2-client/services/api/common'
-import { post } from '@vue2-client/services/api/restTools'
+import { commonApi, post } from '@vue2-client/services/api'
 
 export default {
   name: 'FormGroupEdit',

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

@@ -47,7 +47,7 @@
 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'
+import { post } from '@vue2-client/services/api'
 
 export default {
     name: 'XAddForm',

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'
+
+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/XForm.vue

@@ -70,7 +70,7 @@
 </template>
 <script>
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
-import { post } from '@vue2-client/services/api/restTools'
+import { post } from '@vue2-client/services/api'
 
 export default {
     name: 'XForm',

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

@@ -165,7 +165,7 @@
 </template>
 <script>
 
-import { post } from '@vue2-client/services/api/restTools'
+import { post } from '@vue2-client/services/api'
 import { debounce } from 'ant-design-vue/lib/vc-table/src/utils'
 
 export default {

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

@@ -57,11 +57,10 @@
 import XForm from '@vue2-client/base-client/components/common/XForm/XForm'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm/XAddForm'
 import XTable from '@vue2-client/base-client/components/common/XTable/XTable'
-import { query, commonApi, addOrModify, remove } from '@vue2-client/services/api/common'
+import { commonApi, query, addOrModify, remove, post } from '@vue2-client/services/api'
 import { indexedDB } from '@vue2-client/utils/indexedDB'
 import { mapState } from 'vuex'
 import { Modal } from 'ant-design-vue'
-import { post } from '@vue2-client/services/api/restTools'
 
 export default {
   name: 'XFormTable',

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

@@ -74,8 +74,7 @@
 
 <script>
 import { formatDate } from '@vue2-client/utils/util'
-import { CustomerDetailsViewApi } from '@vue2-client/services/api/CustomerDetailsViewApi'
-import { post } from '@vue2-client/services/api/restTools'
+import { CustomerDetailsViewApi, post } from '@vue2-client/services/api'
 import { mapState } from 'vuex'
 
 export default {