vue2-client 1.9.45 → 1.9.46

package/package.json

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

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

@@ -76,6 +76,19 @@
           />
         </a-card>
       </a-row>
+      <a-row :gutter="16" v-for="(item, key) in childTableData" :key="'childTableRow' + key">
+        <a-card :title="item.name" :bordered="false" size="small">
+          <x-form-table
+            :key="'childTable_' + item.model"
+            :title="item.name"
+            :queryParamsName="item.childTableConfigName"
+            :localEditMode="true"
+            :fixed-query-form="childTableFixedQueryForm(item)"
+            :service-name="serviceName"
+            :ref="'childXFormTable_' + item.model">
+          </x-form-table>
+        </a-card>
+      </a-row>
       <a-row type="flex" justify="end">
         <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">提交</a-button>
       </a-row>
@@ -94,7 +107,8 @@ import { executeStrFunction } from '@vue2-client/utils/runEvalFunction'
 export default {
   name: 'XAddNativeForm',
   components: {
-    XFormItem
+    XFormItem,
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
   },
   props: {},
   data () {
@@ -130,8 +144,6 @@ export default {
       rules: {},
       // 调用logic获取数据源的追加参数
       getDataParams: {},
-      // 是否处理表单key
-      isKeyHandle: true,
       // 动态简易表单集合
       simpleFormJsonData: {},
       // 待修改的数据集
@@ -167,6 +179,12 @@ export default {
         }
       )
     },
+    // 过滤出用于子表数据新增/修改场景的表单项
+    childTableData: function () {
+      return this.formItems.filter((item) => {
+        return item.type === 'childTable'
+      })
+    },
     // 过滤出用于静默新增场景的表单项
     silenceAddJsonData: function () {
       return this.formItems.filter(function (item) {
@@ -203,7 +221,7 @@ export default {
     init (params) {
       const {
         configName, configContent, formItems, formJson, viewMode, isHandleFormKey = true,
-        showSubmitBtn = true, serviceName, isKeyHandle = true,
+        showSubmitBtn = true, serviceName,
         modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {},
         simpleFormJsonData = {}, env = 'prod', layout, xAddFormLayout = 'horizontal'
       } = params
@@ -226,9 +244,8 @@ export default {
       this.getDataParams = getDataParams
       this.simpleFormJsonData = simpleFormJsonData
       this.env = env
-      this.isKeyHandle = isKeyHandle
       // 如果 fixedAddForm 有 selected_id 值，并且设置了处理表单key值，则多给 selected_id 加前缀 避免处理错误
-      if (fixedAddForm.selected_id && this.isKeyHandle) {
+      if (fixedAddForm.selected_id && this.isHandleFormKey) {
         fixedAddForm._selected_id = fixedAddForm.selected_id
         delete fixedAddForm.selected_id
       }
@@ -553,16 +570,29 @@ export default {
     async onSubmit () {
       const valid = await this.validateForm()
       if (!valid) return false
+      if (this.viewMode) {
+        this.$message.info('预览模式禁止新增和修改')
+        return false
+      }
       this.loading = true
       const requestForm = this.prepareForm()
       await this.appendSilenceAddFields(requestForm)
-
       const realForm = this.handleFormKeys(requestForm)
-      if (this.viewMode) {
-        this.$message.info('预览模式禁止新增和修改')
-        return false
+      // 增加子表数据
+      if (this.childTableData.length > 0) {
+        for (const item of this.childTableData) {
+          const childModel = item.model
+          const childData = this.$refs['childXFormTable_' + item.model][0].getTableData()
+          for (let i = 0; i < childData.length; i++) {
+            childData[i] = this.handleFormKeys(childData[i])
+            // 外键不需要带表别名，所以此处放到表单处理后赋值
+            if (realForm.id) {
+              childData[i][item.childTableForeignKeyName] = realForm.id
+            }
+          }
+          realForm[childModel] = childData
+        }
       }
-
       if (this.$listeners.onSubmit) {
         // 交由父级处理
         this.$emit('onSubmit', {
@@ -610,6 +640,15 @@ export default {
       })
     },
 
+    childTableFixedQueryForm (item) {
+      if (this.modifyModelData?.primaryKeyData) {
+        const fixedForm = {}
+        fixedForm[item.childTableForeignKeyName] = Object.values(this.modifyModelData.primaryKeyData)[0]
+        return fixedForm
+      }
+      return null
+    },
+
     prepareForm () {
       const form = { ...this.form }
       for (const key of Object.keys(form)) {
@@ -667,7 +706,7 @@ export default {
           }
           realForm[extraFormKey][realKey] = value
         } else {
-          const realKey = this.isKeyHandle ? this.getRealKey(key) : key
+          const realKey = this.isHandleFormKey ? this.getRealKey(key) : key
           // 如果发生重名，不覆盖，把key的别名带上
           if (realForm[realKey]) {
             realForm[key] = value
@@ -722,7 +761,7 @@ export default {
       }
       // 对动态简易表单项特殊处理
       for (const key in modifyModelData.data) {
-        const realKey = this.isKeyHandle ? this.getRealKey(key) : key
+        const realKey = this.isHandleFormKey ? this.getRealKey(key) : key
         if (this.simpleFormJsonData[realKey]) {
           const extraForm = JSON.parse(modifyModelData.data[key])
           for (const key in extraForm) {

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

@@ -4,7 +4,6 @@
       title="示例表单查询"
       :queryParamsName="queryParamsName"
       :fixedAddForm="fixedAddForm"
-      :localEditMode="true"
       service-name="af-system"
       @action="action"
       @columnClick="columnClick"

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

@@ -304,6 +304,8 @@ export default {
       localEditMode: false,
       // 本地编辑模式所用数据源
       localEditModeDataSource: [],
+      // 本地编辑模式数据源是否已由外部加载
+      isLocalDataSourceLoadedExternally: false,
       // 是否展示右侧工具栏
       showRightTools: true,
       // 加载数据方法 必须为 Promise 对象
@@ -609,6 +611,8 @@ export default {
       this.primaryKey = primaryKey
       this.buttonState = buttonState
       if (this.localEditMode) {
+        this.localEditModeDataSource = []
+        this.isLocalDataSourceLoadedExternally = false
         this.buttonState.import = false
         this.buttonState.export = false
         this.showRightTools = false
@@ -670,6 +674,19 @@ export default {
     async loadTableData (requestParameters) {
       let result
       if (this.localEditMode) {
+        if (!this.isLocalDataSourceLoadedExternally && requestParameters?.conditionParams && Object.keys(requestParameters?.conditionParams).length > 0) {
+          const result = await query(Object.assign(requestParameters, { userId: this.currUser?.id }),
+            this.serviceName, this.env === 'dev')
+          if (result.data) {
+            let no = 0
+            this.localEditModeDataSource = result.data.map(item => {
+              item['序号'] = no
+              no++
+              return item
+            })
+          }
+          this.isLocalDataSourceLoadedExternally = true
+        }
         result = new Promise((resolve) => {
           resolve({
             data: this.localEditModeDataSource

package/src/pages/DynamicStatistics/FavoriteList.vue

@@ -30,7 +30,6 @@ export default {
   },
   methods: {
     loadData () {
-      console.warn(123)
       indexedDB.getAll((data) => {
         const realData = data.filter(item => item.data && item.data.uuid)
           .map(item => item.data)

package/src/pages/NewDynamicStatistics/FavoriteList.vue

@@ -30,7 +30,6 @@ export default {
   },
   methods: {
     loadData () {
-      console.warn(123)
       indexedDB.getAll((data) => {
         const realData = data.filter(item => item.data && item.data.uuid)
           .map(item => item.data)

package/src/router/guards.js

@@ -169,7 +169,6 @@ const loginGuard = (to, from, next, options) => {
       r: v4LoginData.r
     }
     Vue.$store.commit('account/setLogin', login)
-    console.log('Vue.$store.state?.setting?.menuData', JSON.stringify(Vue.$store.state?.setting?.menuData))
     if (!Vue.$store.state?.setting?.menuData || Vue.$store.state?.setting?.menuData?.length === 0) {
       loadRoutes(funcToRouter(v4LoginData.functions))
     }

package/src/utils/request.js

@@ -91,7 +91,7 @@ export function setSystemVersion (value) {
  * 获取系统版本
  */
 export function getSystemVersion () {
-  return Cookie.get(SYSTEM_VERSION)
+  return Cookie.get(SYSTEM_VERSION) || 'V4'
 }
 
 /**

package/vue.config.js

@@ -15,7 +15,8 @@ const v3Server = 'http://aote-office.8866.org:31567'
 const gateway = 'http://192.168.50.67:31467'
 const testUpload = 'http://123.60.214.109:8406'
 const OSSServerDev = 'http://192.168.50.67:30351'
-const revenue = 'http://aote-office.8866.org:31567'
+// const revenue = 'http://aote-office.8866.org:31567'
+const revenue = 'http://127.0.0.1:8080'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川
@@ -65,12 +66,14 @@ module.exports = {
       '/api': {
         // v3用
         // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
+        pathRewrite: { '^/api/': '/' },
         target: revenue,
         changeOrigin: true
       },
       '/devApi': {
         // v3用
         // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
+        pathRewrite: { '^/api/': '/' },
         target: revenue,
         changeOrigin: true
       },