vue2-client 1.9.85 → 1.9.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.85",
+  "version": "1.9.87",
   "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

@@ -92,8 +92,10 @@
           </x-form-table>
         </a-card>
       </a-row>
-      <a-row type="flex" justify="center">
-        <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">提交</a-button>
+      <a-row type="flex" :justify="btnPlace" :style="{paddingLeft: '16px',paddingRight: '16px'}">
+        <slot name="footer" :loading="loading">
+          <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">{{ btnName }}</a-button>
+        </slot>
       </a-row>
     </a-form-model>
   </div>
@@ -153,8 +155,14 @@ export default {
       modifyModelData: {},
       // 当前环境
       env: 'prod',
+      // 表单主键
+      primaryKey: null,
       // 表单模式 horizontal | vertical | inline
-      layout: 'horizontal'
+      layout: 'horizontal',
+      // 提交按钮名称
+      btnName: '提交',
+      // 提交按钮位置 start / center / end
+      btnPlace: 'center'
     }
   },
   computed: {
@@ -188,6 +196,12 @@ export default {
         return item.type === 'childTable'
       })
     },
+    // 过滤出用于form子表数据新增/修改场景的表单项
+    childFormData: function () {
+      return this.formItems.filter((item) => {
+        return item.type === 'rowEdit'
+      })
+    },
     // 过滤出用于静默新增场景的表单项
     silenceAddJsonData: function () {
       return this.formItems.filter(function (item) {
@@ -230,9 +244,9 @@ export default {
     init (params) {
       const {
         configName, configContent, formItems, formJson, viewMode, isHandleFormKey, isKeyHandle = true,
-        showSubmitBtn = true, serviceName,
+        showSubmitBtn = true, serviceName, primaryKey,
         modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {},
-        simpleFormJsonData = {}, env = 'prod', layout, xAddFormLayout = 'horizontal'
+        simpleFormJsonData = {}, env = 'prod', layout, xAddFormLayout = 'horizontal', btnName = '提交', btnPlace = 'center'
       } = params
       this.loaded = false
       // 兼容需要省略 传递 layout: res.xAddFormLayout 可以使用 ...res 展开运算符 直接转递
@@ -253,12 +267,15 @@ export default {
       this.formItems = this.getFromItem(formItems, formJson)
       this.viewMode = viewMode
       this.showSubmitBtn = showSubmitBtn
+      this.primaryKey = primaryKey
       this.serviceName = serviceName
       this.businessType = businessType
       this.title = title
       this.getDataParams = getDataParams
       this.simpleFormJsonData = simpleFormJsonData
       this.env = env
+      this.btnName = btnName
+      this.btnPlace = btnPlace
       // 如果 fixedAddForm 有 selected_id 值，并且设置了处理表单key值，则多给 selected_id 加前缀 避免处理错误
       if (fixedAddForm.selected_id && this.isHandleFormKey) {
         fixedAddForm._selected_id = fixedAddForm.selected_id
@@ -619,6 +636,21 @@ export default {
           realForm[childModel] = childData
         }
       }
+      // 增加form子表数据
+      if (this.childFormData.length > 0) {
+        for (const item of this.childFormData) {
+          const childModel = item.model
+          const childData = this.$refs[item.model].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', {
@@ -834,6 +866,22 @@ export default {
     },
     setForm (obj) {
       this.form = Object.assign(this.form, obj)
+      // 给子表赋外键条件
+      if (this.childFormData.length > 0) {
+        for (const item of this.childFormData) {
+          const child = this.$refs[item.model]
+          // 有主键，且主键有值，添加主键条件
+          if (this.primaryKey && this.form[this.primaryKey]) {
+            const foreignKey = item.foreignKey
+            if (!child.fixedQueryForm) {
+              child.fixedQueryForm = { [foreignKey]: this.form[this.primaryKey] }
+            } else {
+              Object.assign(child.fixedQueryForm, { [foreignKey]: this.form[this.primaryKey] })
+            }
+            child.refreshTable()
+          }
+        }
+      }
     },
     setFormWithKey (obj) {
       setDataByRealKey(this.form, obj)

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

@@ -883,8 +883,8 @@ export default {
     // 把内部的crud表单录入放到表单中，以便外部可以调用
     onComponentMounted (h, attr) {
       console.log('crud表单', h)
-      if (cell.slotRef) {
-        this.registerComponent(attr.key, this.$refs["'childXFormTable_' + attr.model"])
+      if (attr.crud) {
+        this.registerComponent(attr.model, this.$refs['childXFormTable_' + attr.model])
       }
     },
     childTableFixedQueryForm (item) {

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

@@ -181,8 +181,8 @@ export default {
             const values = []
             if (extra.allCheckedNodes) {
               for (const item of extra.allCheckedNodes) {
-                if (item.node.key) {
-                  values.push(item.node.key)
+                if (item.node.key && item.node?.data?.props?.label !== item.node?.data?.props?.value) {
+                  values.push(`${item.node.key}`)
                 }
                 if (item.children && item.children.length) {
                   this.getNodeValues(item.children, value, values)
@@ -198,7 +198,7 @@ export default {
     },
     getNodeValues (data, value, values) {
       for (const item of data) {
-        values.push(item.node.key)
+        values.push(`${item.node.key}`)
         if (item.children && item.children.length) {
           this.getNodeValues(item.children, value, values)
         }

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

@@ -40,7 +40,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'ceshiCRUD',
+      queryParamsName: 'ChargeQueryCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -558,12 +558,14 @@ export default {
               }
               param = Object.assign(param, await runLogic(res.paramLogicName, selectedId, cell.serviceName))
             }
+            console.info('给表单赋值', res)
             this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
               serviceName: cell.serviceName,
               formItems: res.formJson,
               showSubmitBtn: !this.isInAModal,
               businessType: param.businessType || '新增',
               layout: res.xAddFormLayout,
+              primaryKey: res.primaryKey,
               ...res,
               fixedAddForm: param,
               modifyModelData: {

package/src/base-client/plugins/Recording.js

@@ -15,7 +15,7 @@ export default {
         this.inputData = ''
         this.audioChunks = []
 
-        const url = 'ws://192.168.50.67:31090/websocket/bash' // WebSocket地址
+        const url = 'ws://192.168.50.67:30288/websocket/bash' // WebSocket地址
         this.setupWebSocket(url)
 
         // 等待 WebSocket 连接成功
@@ -199,7 +199,27 @@ export default {
       },
 
       getRecordingData () {
-        return this.inputData
+        return new Promise((resolve, reject) => {
+          if (!this.ws) {
+            // 如果 WebSocket 未初始化，直接拒绝
+            reject(this.inputData)
+            return
+          }
+
+          // 保存原有的 onclose 处理逻辑
+          const originalOnClose = this.ws.onclose
+
+          // 新增的 onclose 逻辑
+          this.ws.onclose = (event) => {
+            // 触发原有的 onclose 回调
+            if (typeof originalOnClose === 'function') {
+              originalOnClose(event)
+            }
+
+            // 返回数据
+            resolve(this.inputData)
+          }
+        })
       },
 
       resRecordingData () {