vue2-client 1.9.55 → 1.9.56

package/docs//345/207/275/346/225/260/344/275/277/347/224/250/347/233/270/345/205/263.md

@@ -13,6 +13,8 @@
   * outEnv: 传递给打开的界面的数据，在打开界面的js中通过this.outEnv可以访问
   * attr: 用于传递参数绑定到 modal 弹框上
 - getOutEnv 获取获取 outEnv
+- this.getRealKeyData(obj) 获取真实的数据 传递 {a_a:"1"} 返回 {a:"1"}
+
 ```js
 this.openDialog('xxx', 5, {}, {}, {})
 ```
@@ -52,7 +54,8 @@ this.openDialog('xxx', 5, {}, {}, {})
 # form 简易表单
 
 - asyncSubmit().then(res=>{}) 手动提交表单
-- setForm({}) 手动设置表单内容
+- setForm({}) 手动设置表单内容 传参：{a:'aa'}  如果表单配置 {a:''} 会合并到表单项目a中
+- setFormWithKey({}) 手动设置表单内容 传参：{a_a:'aa'}  如果表单配置 {b_a:''} 或者 {c_a:'''} 会合并到表单项目b_a,c_a中
 - 事件相关
   - onSubmit(form) 表单提交事件
 

package/package.json

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

@@ -851,6 +851,9 @@ export default {
     setForm (obj) {
       this.form = Object.assign(this.form, obj)
     },
+    setFormWithKey (obj) {
+      setDataByRealKey(this.form, obj)
+    },
     emitFunc (func, data) {
       // 打开列表选择框逻辑
       if (func === 'openSelectCRUDFrom') {

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

@@ -30,6 +30,7 @@ import { mapState } from 'vuex'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import { runLogic } from '@vue2-client/services/api/common'
 import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@vue2-client/utils/microAppUtils'
+import { getRealKeyData } from '@vue2-client/utils/util'
 
 export default {
   name: 'XAddReport',
@@ -98,6 +99,7 @@ export default {
     microDispatch,
     getMicroData,
     runLogic,
+    getRealKeyData,
     init (params) {
       console.log('params', params)
       const {

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

@@ -124,7 +124,7 @@ import {
 import { mapState } from 'vuex'
 import XTreePro from '@vue2-client/base-client/components/common/XTree/XTreePro.vue'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
-import util from '@vue2-client/utils/util'
+import util, { getRealKeyData } from '@vue2-client/utils/util'
 
 export default {
   name: 'XFormTable',
@@ -316,6 +316,7 @@ export default {
   },
   methods: {
     runLogic,
+    getRealKeyData,
     getConfigByNameAsync,
     getConfigByName,
     columnClick (key, value, record) {

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

@@ -25,6 +25,7 @@ import { mapState } from 'vuex'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import { runLogic } from '@vue2-client/services/api/common'
 import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@vue2-client/utils/microAppUtils'
+import { getRealKeyData } from '@vue2-client/utils/util'
 
 export default {
   name: 'XReportDrawer',
@@ -91,6 +92,7 @@ export default {
     isMicroAppEnv,
     microDispatch,
     getMicroData,
+    getRealKeyData,
     runLogic,
     init (params) {
       console.log('params', params)

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

@@ -27,7 +27,7 @@ export default {
     XReport, XAddReport
   },
   mounted () {
-      this.$refs.main.openDrawer('medicalTestCover', -1, {})
+      this.$refs.main.openDialog('medicalTestCover', -1, {})
   },
   data () {
     return {

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

@@ -388,7 +388,7 @@
 
 <script>
 import Upload from '@vue2-client/base-client/components/common/Upload'
-import { formatDate } from '@vue2-client/utils/util'
+import { formatDate, getRealKeyData } from '@vue2-client/utils/util'
 import { nanoid } from 'nanoid'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
@@ -497,6 +497,7 @@ export default {
     isMicroAppEnv,
     microDispatch,
     getMicroData,
+    getRealKeyData,
     onComponentMounted (h, cell, cellIndex) {
       if (this.getMixinData && this.getMixinData()) {
         this.mixinData = this.getMixinData()

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

@@ -28,6 +28,7 @@
 <script>
 import { getConfigByName, getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
+import { getRealKeyData } from '@vue2-client/utils/util'
 import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@vue2-client/utils/microAppUtils'
 
 export default {
@@ -52,6 +53,7 @@ export default {
     isMicroAppEnv,
     microDispatch,
     getMicroData,
+    getRealKeyData,
     getConfigByName,
     getConfigByNameAsync,
     tabPaneChange (newKey) {

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

@@ -70,7 +70,7 @@
               {{ button.buttonName }}
             </a-button>
 
-            <a-button v-if="allowCardMode" @click="changeViewMode" :type="isTableMode ? '' : 'primary'">
+            <a-button v-if="allowedCardMode" @click="changeViewMode" :type="isTableMode ? '' : 'primary'">
               看板模式
             </a-button>
             <slot name="button" :selectedRowKeys="selectedRowKeys" :selectedRows="selectedRows"></slot>
@@ -404,7 +404,7 @@ export default {
       // 是否进行初始化查询
       createdQuery: true,
       // 允许看板模式
-      allowCardMode: false,
+      allowedCardMode: false,
       // 看板模式配置
       cardModeConfig: undefined,
       // 暂存行编辑前数据 用于比较哪些变化了才需要保存

package/src/router/async/router.map.js

@@ -86,8 +86,8 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {
               // 菜单中不显示