vue2-client 1.8.0-7 → 1.8.0-9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.0-7",
+  "version": "1.8.0-9",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
@@ -82,6 +82,7 @@
   "browserslist": [
     "> 1%",
     "last 2 versions",
-    "not ie <= 10"
+    "not dead",
+    "not ie 11"
   ]
 }

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

@@ -680,7 +680,7 @@ export default {
     // 编辑数据字段前准备数据
     editColumnItemExecute (_item) {
       this.type = '修改'
-      const defaultValue = { formType: 'input', type: 'string', addOrEdit: 'all', slot: { type: 'default' }, rule: {}, selectKey: {} }
+      const defaultValue = { formType: 'input', type: 'string', addOrEdit: 'all', slot: { type: 'default' }, rule: {}, selectKey: {}, column: [] }
       if (!_item.queryType) {
         defaultValue.queryType = '='
       }

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

@@ -9,7 +9,11 @@
     okText="提交"
     @cancel="close"
     @ok="$refs.nativeForm.onSubmit()">
-    <x-add-native-form ref="nativeForm" @onSubmit="onSubmit" @tempTableModify="tempTableModify"/>
+    <x-add-native-form
+      ref="nativeForm"
+      @afterSubmit="afterSubmit"
+      @onSubmit="onSubmit"
+      @tempTableModify="tempTableModify"/>
   </a-modal>
 </template>
 <script>
@@ -43,6 +47,7 @@ export default {
     },
     methods: {
       init (params) {
+        params.showSubmitBtn = false
         const {
           businessType, title
         } = params
@@ -50,7 +55,7 @@ export default {
         this.title = title
         this.visible = true
         const that = this
-        that.$nextTick(function () {
+        that.$nextTick(() => {
           that.$refs.nativeForm.init(params)
         })
       },
@@ -60,9 +65,20 @@ export default {
       },
       onSubmit (params) {
         this.loading = true
-        this.$emit('onSubmit', params, () => {
-          this.close()
-        })
+        if (this.$listeners.onSubmit) {
+          // 交由父级处理
+          this.$emit('onSubmit', params, () => {
+            this.close()
+          })
+        } else {
+          // 触发默认提交事件
+          this.$refs.nativeForm.defaultSubmit(params.realForm, () => {
+            this.close()
+          })
+        }
+      },
+      afterSubmit (params) {
+        this.$emit('afterSubmit', params)
       },
       tempTableModify (params) {
         this.$emit('tempTableModify', params)

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

@@ -1,63 +1,66 @@
 <template>
-  <a-form-model
-    v-if="loaded"
-    ref="selectForm"
-    :zIndex="1001"
-    :model="form"
-    :rules="rules">
-    <a-row :gutter="16">
-      <x-form-item
-        v-for="(item, index) in realJsonData"
-        :key="index"
-        :attr="item"
-        :disabled="itemDisabled(item)"
-        :files="files"
-        :form="form"
-        :images="images"
-        :service-name="serviceName"
-        mode="新增/修改"
-        :get-data-params="getDataParams"
-      />
-    </a-row>
-    <a-row :gutter="16" v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
-      <a-card :title="groupItem.name" :bordered="false" size="small">
+  <div>
+    <a-form-model
+      v-if="loaded"
+      ref="selectForm"
+      :zIndex="1001"
+      :model="form"
+      :rules="rules">
+      <a-row :gutter="16">
         <x-form-item
-          v-for="(item, index) in groupItem.groupItems"
+          v-for="(item, index) in realJsonData"
           :key="index"
           :attr="item"
           :disabled="itemDisabled(item)"
           :files="files"
-          :form="form[groupItem.model]"
-          :images="images"
-          :service-name="serviceName"
-          mode="新增/修改"
-          :get-data-params="getDataParams"
-        />
-      </a-card>
-    </a-row>
-    <a-row :gutter="16" v-for="(item, key) in simpleFormJsonData" :key="'row' + key">
-      <a-card :title="item.name" :bordered="false" size="small">
-        <x-form-item
-          v-for="(formItem, formItemIndex) in item.value"
-          :key="key + formItemIndex"
-          :attr="formItem"
-          :disabled="itemDisabled(formItem)"
-          :files="files"
           :form="form"
           :images="images"
           :service-name="serviceName"
           mode="新增/修改"
           :get-data-params="getDataParams"
         />
-      </a-card>
-    </a-row>
-  </a-form-model>
+      </a-row>
+      <a-row :gutter="16" v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
+        <a-card :title="groupItem.name" :bordered="false" size="small">
+          <x-form-item
+            v-for="(item, index) in groupItem.groupItems"
+            :key="index"
+            :attr="item"
+            :disabled="itemDisabled(item)"
+            :files="files"
+            :form="form[groupItem.model]"
+            :images="images"
+            :service-name="serviceName"
+            mode="新增/修改"
+            :get-data-params="getDataParams"
+          />
+        </a-card>
+      </a-row>
+      <a-row :gutter="16" v-for="(item, key) in simpleFormJsonData" :key="'row' + key">
+        <a-card :title="item.name" :bordered="false" size="small">
+          <x-form-item
+            v-for="(formItem, formItemIndex) in item.value"
+            :key="key + formItemIndex"
+            :attr="formItem"
+            :disabled="itemDisabled(formItem)"
+            :files="files"
+            :form="form"
+            :images="images"
+            :service-name="serviceName"
+            mode="新增/修改"
+            :get-data-params="getDataParams"
+          />
+        </a-card>
+      </a-row>
+    </a-form-model>
+    <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">提交</a-button>
+  </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 { runLogic } from '@vue2-client/services/api/common'
+import { addOrModify, runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XAddNativeForm',
@@ -82,10 +85,16 @@ export default {
       loading: false,
       // 表单Model
       form: {},
+      // 配置名称
+      configName: undefined,
+      // 配置内容，用于查询配置生成器的预览
+      configContent: undefined,
       // 表单项集合
       formItems: [],
       // 服务名称
       serviceName: undefined,
+      // 是否显示提交按钮
+      showSubmitBtn: true,
       // 修改有文件的表单时使用
       files: [],
       images: [],
@@ -142,9 +151,11 @@ export default {
   methods: {
     init (params) {
       const {
-        formItems, viewMode, isHandleFormKey = true, serviceName, isTableTemp = false, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
+        configName, configContent, formItems, viewMode, isHandleFormKey = true, showSubmitBtn = true, serviceName, isTableTemp = false, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
       } = params
       this.loaded = false
+      this.configName = configName
+      this.configContent = configContent
       if (typeof formItems === 'string') {
           this.formItems = JSON.parse(formItems)
       } else {
@@ -152,6 +163,7 @@ export default {
       }
       this.viewMode = viewMode
       this.isHandleFormKey = isHandleFormKey
+      this.showSubmitBtn = showSubmitBtn
       this.serviceName = serviceName
       this.businessType = businessType
       this.title = title
@@ -334,21 +346,42 @@ export default {
         }
         if (this.viewMode) {
           this.$message.info('预览模式禁止新增和修改')
-          console.log({
+          return false
+        }
+        if (this.$listeners.onSubmit) {
+          // 交由父级处理
+          this.$emit('onSubmit', {
             businessType: this.businessType,
             serviceName: this.serviceName,
             realForm: realForm,
             currUserName: this.currUser.name
           })
-          return false
+        } else {
+          this.defaultSubmit(realForm)
+        }
+      })
+    },
+    // 默认提交事件
+    defaultSubmit (realForm, callback) {
+      // 组织请求
+      const requestParameters = {
+        queryParamsName: this.configName,
+        queryParams: this.configContent,
+        form: realForm,
+        businessType: this.businessType,
+        operator: this.currUser.name
+      }
+      addOrModify(requestParameters, this.serviceName).then(data => {
+        this.$message.success(this.businessType + '成功！')
+        // commit
+        this.$emit('afterSubmit', { type: this.businessType, id: data.id, form: requestParameters.form })
+      }).catch(e => {
+        this.$message.error(this.businessType + '失败：' + e)
+      }).finally(() => {
+        this.loading = false
+        if (callback) {
+          callback()
         }
-        // 交由父级处理
-        this.$emit('onSubmit', {
-          businessType: this.businessType,
-          serviceName: this.serviceName,
-          realForm: realForm,
-          currUserName: this.currUser.name
-        })
       })
     },
     // 获取表单字段实际值

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

@@ -0,0 +1,117 @@
+<template>
+  <div>
+    <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
+    <div v-show="!loading">
+      <template v-if="!loadError">
+        <a-descriptions v-if="realData" :column="isMobile ? 1 : column" size="small" :title="title">
+          <a-descriptions-item
+            v-for="(value, key) in realData"
+            :key="key"
+            :label="key">
+            {{ formatText(value) }}
+          </a-descriptions-item>
+        </a-descriptions>
+      </template>
+      <template v-else>
+        <a-empty>
+          <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
+        </a-empty>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+
+import { mapState } from 'vuex'
+import { getConfig } from '@vue2-client/services/api'
+
+export default {
+  name: 'XDescriptions',
+  components: {
+  },
+  props: {
+    // 标题
+    title: {
+      type: String,
+      required: true
+    },
+    // 内容
+    content: {
+      type: Object,
+      required: true
+    },
+    // 模型名
+    model: {
+      type: String,
+      required: true
+    },
+    // 配置名称
+    configName: {
+      type: String,
+      required: true
+    },
+    // 配置所属命名空间
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    // 每列显示数量
+    column: {
+      type: Number,
+      default: 2
+    }
+  },
+  created () {
+    this.initConfig()
+  },
+  data () {
+    return {
+      // 加载状态
+      loading: false,
+      loadError: false,
+      realData: undefined
+    }
+  },
+  computed: {
+    ...mapState('setting', ['isMobile'])
+  },
+  methods: {
+    initConfig () {
+      this.loading = true
+      this.loadError = false
+      if (this.configName) {
+        this.getConfig()
+      } else {
+        this.loading = false
+        this.loadError = true
+      }
+    },
+    getConfig () {
+      getConfig(this.configName, this.serviceName, (res) => {
+        const mapIndex = {}
+        res.formJson.filter(item => {
+          const model = item.model
+          return model.indexOf(this.model) > 0
+        })[0].groupItems.forEach(item => {
+          mapIndex[item.model.substring(item.model.indexOf('_') + 1)] = item.name
+        })
+        const result = {}
+        for (const key of Object.keys(this.content)) {
+          const name = mapIndex[key]
+          if (name) {
+            result[name] = this.content[key]
+          } else {
+            result[key] = this.content[key]
+          }
+        }
+        this.realData = result
+        this.loading = false
+      })
+    },
+    // 文字格式化
+    formatText (value) {
+      return value || '--'
+    }
+  }
+}
+</script>

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

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

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

@@ -0,0 +1,83 @@
+# XDescriptions
+
+动态Descriptions控件，根据JSON配置动态生成Descriptions
+
+
+## 何时使用
+
+当需要一个动态生成的Descriptions时
+
+
+引用方式：
+
+```javascript
+import XDescriptions from '@vue2-client/base-client/components/XDescriptions/XDescriptions'
+
+export default {
+    components: {
+      XDescriptions
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<x-descriptions
+  title="设备属性"
+  :content="details.prop_json"
+  :queryParamsName="queryParamsName">
+</x-descriptions>
+```
+
+## API
+
+| 参数              | 说明          | 类型     | 默认值  |
+|-----------------|-------------|--------|------|
+| title           | 业务名称        | String | ''   |
+| content         | 业务内容        | String | ''   |
+| queryParamsName | 查询配置JSON文件名 | String | null |
+| serviceName     | 配置所属命名空间    | String | null |
+
+## 例子1
+----
+（基础使用）
+
+```vue
+<template>
+  <x-descriptions
+    title="设备属性"
+    :content="details.prop_json"
+    :configName="configName">
+  </x-descriptions>
+</template>
+
+<script>
+  import XDescriptions from '@vue2-client/base-client/components/XDescriptions/XDescriptions'
+
+  export default {
+    components: {
+      XDescriptions
+    },
+    data () {
+      return {
+        // 查询配置文件名
+        configName: 'logQueryParams',
+        details: {
+          prop_json: {
+              规格: 'G2.5'
+          }
+        }
+      }
+    },
+    created () {
+
+    },
+    methods: {
+
+    }
+  }
+</script>
+```

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

@@ -5,7 +5,7 @@
       <template v-if="!loadError">
         <x-add-form
           ref="xAddForm"
-          @onSubmit="onAddOrEditSubmit"
+          @afterSubmit="onAddOrEditSubmitAfterSubmit"
         />
         <x-form
           ref="xForm"
@@ -57,7 +57,7 @@ import XForm from '@vue2-client/base-client/components/common/XForm'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm'
 import XTable from '@vue2-client/base-client/components/common/XTable'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
-import { addOrModify, getConfig, getConfigByLogic, parseConfig } from '@vue2-client/services/api/common'
+import { getConfig, getConfigByLogic, parseConfig } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
 
 export default {
@@ -240,27 +240,12 @@ export default {
       }
     },
     /**
-     * 提交新增表单事件
+     * 提交新增/修改表单后事件
      */
-    onAddOrEditSubmit (res, callback) {
-      // 组织请求
-      const requestParameters = {
-        queryParamsName: this.queryParamsName,
-        queryParams: this.queryParamsJson,
-        form: res.realForm,
-        businessType: res.businessType,
-        operator: res.currUserName
-      }
-      addOrModify(requestParameters, this.serviceName).then(data => {
-        this.$message.success(res.businessType + '成功！')
-        this.refreshTable(res.businessType === '新增')
-        // commit
-        this.$emit('afterSubmit', { type: res.businessType, id: data.id, form: requestParameters.form })
-      }).catch(e => {
-        this.$message.error(res.businessType + '失败：' + e)
-      }).finally(() => {
-        callback()
-      })
+    onAddOrEditSubmitAfterSubmit (res) {
+      this.refreshTable(res.businessType === '新增')
+      // commit
+      this.$emit('afterSubmit', res)
     },
     /**
      * 表格查询后事件
@@ -288,6 +273,8 @@ export default {
         businessType: '新增',
         title: this.title,
         isShow: !res.buttonState || res.buttonState.add || res.buttonState.edit,
+        configName: this.queryParamsName,
+        configContent: this.queryParamsJson,
         formItems: res.formJson,
         viewMode: this.viewMode,
         isTableTemp: this.isTableTemp,
@@ -306,6 +293,8 @@ export default {
         businessType: '修改',
         title: this.title,
         isShow: !res.buttonState || res.buttonState.add || res.buttonState.edit,
+        configName: this.queryParamsName,
+        configContent: this.queryParamsJson,
         formItems: res.formJson,
         viewMode: this.viewMode,
         isTableTemp: this.isTableTemp,

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

@@ -38,6 +38,7 @@ export default {
 | title              | 业务名称                    | String  | ''    |
 | queryParamsName    | 查询配置JSON文件名             | String  | null  |
 | queryParamsJson    | 查询配置文件Json，用于查询配置生成器的预览 | Object  | null  |
+| serviceName        | 配置所属命名空间                | String  | null  |
 | logicName          | 通过logic获取表单表格配置         | String  | null  |
 | logicParam         | 执行logic传递的参数            | Object  | null  |
 | fixedQueryForm     | 固定查询表单,会和查询表单合并查询       | Object  | {}    |

package/vue.config.js

@@ -35,6 +35,9 @@ module.exports = {
         target: 'http://127.0.0.1:4789',
         changeOrigin: true
       }
+    },
+    client: {
+      overlay: false
     }
   },
   pluginOptions: {
@@ -73,7 +76,7 @@ module.exports = {
     if (isProd) {
       // add `CompressionWebpack` plugin to webpack plugins
       config.plugins.push(new CompressionWebpackPlugin({
-        algorithm: require('zlib').createGzip,
+        algorithm: 'gzip',
         test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
         threshold: 10240,
         minRatio: 0.8

package//350/277/201/347/247/273/346/227/245/345/277/227.md

@@ -1,15 +1,15 @@
-# vue2迁移vue3
-
-1. 完成vue-cli，webpack，babel，eslint的升级
-   - core-js 3.30.1 -> 3.33.0
-   - add regenerator-runtime
-   - @babel/core 7.21.4 -> 7.22.20
-   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
-   - @vue/cli 4.5.19 -> 5.0.8
-   - babel-jest 25.5.1 -> 26.6.3
-   - eslint 6.8.0 -> 7.32.0
-   - jest 24.0.0 -> 26.6.3
-   - webpack 4.46.0 -> 5.88.2
-2. 完成vue2的2.7升级
-   - vue 2.6.14 -> 2.7.14
-   - eslint 7.32.0 -> 8.51.0
+# vue2迁移vue3
+
+1. 完成vue-cli，webpack，babel，eslint的升级
+   - core-js 3.30.1 -> 3.33.0
+   - add regenerator-runtime
+   - @babel/core 7.21.4 -> 7.22.20
+   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
+   - @vue/cli 4.5.19 -> 5.0.8
+   - babel-jest 25.5.1 -> 26.6.3
+   - eslint 6.8.0 -> 7.32.0
+   - jest 24.0.0 -> 26.6.3
+   - webpack 4.46.0 -> 5.88.2
+2. 完成vue2的2.7升级
+   - vue 2.6.14 -> 2.7.14
+   - eslint 7.32.0 -> 8.51.0