vue2-client 1.7.10-test → 1.7.11

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "vue2-client",
-  "version": "1.7.10-test",
+  "version": "1.7.11",
   "private": false,
   "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
     "lint": "vue-cli-service lint",
     "build:preview": "vue-cli-service build --mode preview",

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

@@ -148,7 +148,7 @@
                   </a-tooltip>
                   <a-tooltip>
                     <template slot="title">
-                      字段JSON存储
+                      字段组存储
                     </template>
                     <a-tag :color="columnItem.dataModeArray.includes('group') ? '#82A0D8' : 'rgba(0, 0, 0, 0.25)'"><a-icon type="crown" /></a-tag>
                   </a-tooltip>

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

@@ -19,6 +19,20 @@
         :get-data-params="getDataParams"
       />
     </a-row>
+    <a-row :gutter="16" v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
+      <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-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
@@ -93,6 +107,22 @@ export default {
         return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version' && !this.itemDisabled(item)
       })
     },
+    // 过滤出用于新增/修改场景的表单项
+    groupJsonData: function () {
+      return this.formItems.filter((item) => {
+        return item.type === 'group'
+      }).map((item) => {
+          item.groupItems = item.groupItems.filter((item) => {
+            return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version' && !this.itemDisabled(item)
+          }).map((groupItem) => {
+            // 只保留第一个下划线后面的内容
+            groupItem.model = groupItem.model.substring(groupItem.model.indexOf('_') + 1)
+            return groupItem
+          })
+          return item
+        }
+      )
+    },
     // 过滤出用于静默新增场景的表单项
     silenceAddJsonData: function () {
       return this.formItems.filter(function (item) {
@@ -132,6 +162,15 @@ export default {
         const item = this.realJsonData[i]
         this.setFormProps(formData, item)
       }
+      // 设置表单分组项目相关参数
+      for (let i = 0; i < this.groupJsonData.length; i++) {
+        const groupItem = this.groupJsonData[i]
+        formData[groupItem.model] = {}
+        for (let j = 0; j < groupItem.groupItems.length; j++) {
+          const item = groupItem.groupItems[j]
+          this.setFormProps(formData[groupItem.model], item)
+        }
+      }
       // 设置动态简易表单项的相关参数
       for (const key in this.simpleFormJsonData) {
         for (const item of this.simpleFormJsonData[key].value) {
@@ -234,10 +273,6 @@ export default {
         if (!valid) {
           return false
         }
-        if (this.viewMode) {
-          this.$message.info('预览模式禁止新增和修改')
-          return false
-        }
         this.loading = true
         for (const key of Object.keys(this.form)) {
           if (this.form[key] === null || this.form[key] === '') {
@@ -293,6 +328,16 @@ export default {
             realForm[realKey] = value
           }
         }
+        if (this.viewMode) {
+          this.$message.info('预览模式禁止新增和修改')
+          console.log({
+            businessType: this.businessType,
+            serviceName: this.serviceName,
+            realForm: realForm,
+            currUserName: this.currUser.name
+          })
+          return false
+        }
         // 交由父级处理
         this.$emit('onSubmit', {
           businessType: this.businessType,
@@ -347,6 +392,16 @@ export default {
           this.form[item.model] = undefined
         }
       }
+      // 对分组表单进行处理
+      for (let i = 0; i < this.groupJsonData.length; i++) {
+        const item = this.groupJsonData[i]
+        try {
+          if (modifyModelData.data[item.model]) {
+            this.form[item.model] = JSON.parse(modifyModelData.data[item.model])
+          }
+        } catch (e) {
+        }
+      }
       // 追加版本号信息
       for (const item of this.versionJsonData) {
         if (!modifyModelData.data[item.model]) {

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

@@ -15,6 +15,16 @@
           :service-name="serviceName"
           :get-data-params="getDataParams"
         />
+        <div v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
+          <x-form-item
+            v-for="(item, index) in groupItem.groupItems"
+            :key="index"
+            :attr="item"
+            :form="form"
+            :service-name="serviceName"
+            :get-data-params="getDataParams"
+          />
+        </div>
         <div v-show="advanced">
           <x-form-item
             v-for="(item, index) in realJsonData.slice(6)"
@@ -87,6 +97,20 @@ export default {
     realJsonData: function () {
       return this.formItems.filter(item => !item.isOnlyAddOrEdit)
     },
+    // 过滤出用于新增/修改场景的表单项
+    groupJsonData: function () {
+      return this.formItems.filter((item) => {
+        return item.type === 'group'
+      }).map((item) => {
+          item.groupItems = item.groupItems.filter(item => !item.isOnlyAddOrEdit).map((groupItem) => {
+            // 只保留第一个下划线后面的内容
+            groupItem.model = groupItem.model.substring(groupItem.model.indexOf('_') + 1)
+            return groupItem
+          })
+          return item
+        }
+      )
+    },
   },
   methods: {
     init (params) {

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

@@ -147,14 +147,6 @@ export default {
       },
       deep: true
     },
-    fixedQueryForm: {
-      handler () {
-        this.$nextTick(() => {
-          this.refreshTable(true)
-        })
-      },
-      deep: true
-    },
     queryParamsJson: {
       handler () {
         this.getConfigBySource()
@@ -343,6 +335,15 @@ export default {
     refreshTable (toFirstPage = true) {
       this.$refs.xTable.refresh(toFirstPage)
     },
+    /**
+     * 设置固定查询表单
+     */
+    setFixedQueryForm (form, isRefreshTable) {
+      this.fixedQueryForm = form
+      if (isRefreshTable) {
+        this.refreshTable(true)
+      }
+    }
   }
 }
 </script>

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

@@ -129,7 +129,9 @@ export default {
         // 取到表格携带的表单参数
         const requestParameters = Object.assign({}, parameter)
         // 取到父组件传入的表单参数
-        const conditionParams = Object.assign(this.form, this.fixedQueryForm)
+        const conditionParams = {}
+        Object.assign(conditionParams, this.fixedQueryForm)
+        Object.assign(conditionParams, this.form)
         // 如果传了燃气公司字段，则进行数据处理
         if (conditionParams.orgName) {
           requestParameters.orgName = conditionParams.orgName

package/src/config/CreateQueryConfig.js

@@ -27,7 +27,7 @@ module.exports = {
       noMatch: ['file', 'image', 'textarea', 'personSetting']
     },
     {
-      label: '字段JSON存储',
+      label: '字段组存储',
       value: 'group',
       noMatch: ['file', 'image', 'textarea', 'personSetting']
     }

package/vue.config.js

@@ -8,9 +8,9 @@ const CompressionWebpackPlugin = require('compression-webpack-plugin')
 const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
-const server = 'http://221.193.244.147:9600'
+const server = 'http://61.134.55.234:8405'
 // const local = 'http://localhost:8445/webmeter'
-const local = 'http://221.193.244.147:9600/webmeter'
+const local = 'http://61.134.55.234:8456/webmeter'
 // const local = 'http://localhost:8080'
 
 module.exports = {
@@ -30,7 +30,7 @@ module.exports = {
         changeOrigin: true
       },
       '/api': {
-        pathRewrite: { '^/api/af-system/': '/rs/' },
+        pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
         // pathRewrite: { '^/api': '/' },
         target: local,
         changeOrigin: true