vue2-client 1.8.39 → 1.8.41

package/CHANGELOG.md

@@ -1,7 +1,7 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
-**1.8.37 - 1.8.39 -2024-1-30 @江超**
+**1.8.37 - 1.8.41 -2024-1-30 @江超**
 - 开发环境增加水印
 
 **1.8.36 -2024-1-25 @江超**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.39",
+  "version": "1.8.41",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/App.vue

@@ -10,7 +10,7 @@ import { mapState, mapMutations } from 'vuex'
 import themeUtil from '@vue2-client/utils/themeUtil'
 import { getI18nKey } from '@vue2-client/utils/routerUtil'
 import { setSystemVersion } from '@vue2-client/utils/request'
-import createWaterMark from '@vue2-client/utils/waterMark'
+import waterMark from '@vue2-client/utils/waterMark'
 
 export default {
   name: 'App',
@@ -31,7 +31,7 @@ export default {
       const config = JSON.parse(configStr)
       if (config.$globalProp.environment === 'dev') {
         // 设置水印
-        createWaterMark('开发环境')
+        waterMark('开发环境')
       }
     }
     // 设置系统版本

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

@@ -104,14 +104,13 @@ export default {
       getDataParams: {},
       // 是否为临时表
       isTableTemp: false,
+      // 是否处理表单key
+      isKeyHandle: true,
       // 动态简易表单集合
       simpleFormJsonData: {}
     }
   },
   computed: {
-    businessTitle () {
-      return this.businessType + this.title
-    },
     // 过滤出用于新增/修改场景的表单项
     realJsonData: function () {
       return this.formItems.filter((item) => {
@@ -151,7 +150,7 @@ export default {
   methods: {
     init (params) {
       const {
-        configName, configContent, formItems, viewMode, isHandleFormKey = true, showSubmitBtn = true, serviceName, isTableTemp = false, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
+        configName, configContent, formItems, viewMode, isHandleFormKey = true, showSubmitBtn = true, serviceName, isTableTemp = false, isKeyHandle = true, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
       } = params
       this.loaded = false
       this.configName = configName
@@ -170,6 +169,7 @@ export default {
       this.getDataParams = getDataParams
       this.simpleFormJsonData = simpleFormJsonData
       this.isTableTemp = isTableTemp
+      this.isKeyHandle = isKeyHandle
       // 设置普通表单项的相关参数
       const formData = Object.assign({}, fixedAddForm)
       for (let i = 0; i < this.realJsonData.length; i++) {
@@ -340,7 +340,7 @@ export default {
             }
             realForm[extraFormKey][realKey] = value
           } else {
-            const realKey = this.getRealKey(key)
+            const realKey = this.isKeyHandle ? this.getRealKey(key) : key
             realForm[realKey] = value
           }
         }
@@ -402,7 +402,7 @@ export default {
       }
       // 对动态简易表单项特殊处理
       for (const key in modifyModelData.data) {
-        const realKey = this.getRealKey(key)
+        const realKey = this.isKeyHandle ? this.getRealKey(key) : key
         if (this.simpleFormJsonData[realKey]) {
           const extraForm = JSON.parse(modifyModelData.data[key])
           for (const key in extraForm) {

package/src/utils/waterMark.js

@@ -15,8 +15,8 @@ export default function createWaterMark (waterMarkName) {
   if (!waterMarkName) {
     return
   }
-  const width = document.body.clientWidth
-  const canvasWidth = width / width / 320
+  const width = window.parseInt(document.body.clientWidth)
+  const canvasWidth = width / window.parseInt(width / 320)
   const fontFamily = window.getComputedStyle(document.body)['font-family']
   const fragment = document.createDocumentFragment()
   waterMarkDOM = document.createElement('div')