vue2-client 1.8.161 → 1.8.163

package/package.json

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

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

@@ -84,6 +84,10 @@ export default {
     serverName: {
       type: String,
       default: 'af-system'
+    },
+    displayOnly: {
+      type: Boolean,
+      default: false
     }
   },
   components: {
@@ -595,7 +599,7 @@ export default {
       if (this.configData === undefined) {
         console.error('未找到数据！')
       } else {
-        this.originalConfig = Object.assign({}, this.localConfig)
+        this.originalConfig = Object.assign({}, this.config)
         this.originalConfig.data = JSON.parse(JSON.stringify(this.configData))
         this.type = 'display'
         this.onlyDisplay = true
@@ -607,8 +611,15 @@ export default {
     },
   },
   beforeMount () {
+    if (this.displayOnly) {
+      this.onlyDisplay = true
+      this.type = 'display'
+    }
     if (this.localConfig) {
       if (this.localConfig.designMode === 'json') {
+        if (this.configData !== undefined) {
+          this.config.data = this.configData
+        }
         this.jsonConfigInit()
       } else {
         this.config = this.localConfig
@@ -624,6 +635,9 @@ export default {
       getConfigByName(this.configName, this.serverName, res => {
         this.config = res
         if (this.config.designMode === 'json') {
+          if (this.configData !== undefined) {
+            this.config.data = this.configData
+          }
           this.jsonConfigInit()
         } else {
           if (this.configData !== undefined) {

package/src/pages/AMisDemo/AMisDemo.vue

@@ -4,9 +4,6 @@
 <script>
 import AMISRenderer from '@vue2-client/base-client/components/common/AMisRender'
 import Vue from 'vue'
-// import router from '@vue2-client/router'
-// import store from 'core-js/internals/shared-store'
-// import { i18n } from '../../../index'
 import Index from '@vue2-client/base-client/components/index.js'
 
 const vms = {}
@@ -227,66 +224,80 @@ const schema2 = {
       type: 'grid',
       columns: [
         {
+          md: 3,
           body: [
             {
               type: 'input-tree',
-              name: 'test_tree',
+              name: 'test_tree2',
               label: '树选择框',
               options: [
                 {
                   label: '查询配置',
+                  icon: 'fa fa-cogs',
                   children: [
                     {
                       label: '字典管理',
-                      value: 'crud_dictionary_manage'
+                      value: 'crud_dictionary_manage',
+                      icon: 'fa fa-cog'
                     },
                     {
-                      label: '操作日志',
-                      value: 'crud_oper_log_manage'
+                      label: '字典值管理',
+                      value: 'crud_dictionary_value_manage',
+                      icon: 'fa fa-cog'
                     }
                   ]
                 }
-              ]
+              ],
+              value: 'crud_dictionary_manage'
             }
-          ],
-          id: 'u:b1d2075dc231',
-          md: 1.5
+          ]
         },
         {
+          md: 9,
           body: [
             {
-              name: 'xTable', // 如果要放在 form 中，需要设置 name，onChange 将会设置这个值
+              name: 'xTable',
               type: 'custom',
-              // onMount 将会在组件创建时执行，默认会创建一个空 div 标签，也可以设置 inline: true 来创建 span 标签
-              // dom 是 dom 节点，value 是初始数据，比如表单 name 初始拿到的数据，onChange 只有在表单下才会有
-              onMount: (dom, value, onChange) => {
+              onMount: (dom, value, onChange, props) => {
+                console.warn('value', value)
+                console.warn('props', props)
                 const vm = new Vue({
                   router,
                   store,
                   i18n,
-                  render: h => h(Index.XFormTable, {
-                    props: {
-                      queryParamsName: `crud_dictionary_manage`
-                    }
-                  })
+                  data: {
+                    queryParamsNameFather: 'crud_dictionary_manage'
+                  },
+                  render: function (createElement) {
+                    return createElement(
+                      'div',
+                      [
+                        createElement(Index.XFormTable, {
+                          props: {
+                            queryParamsName: this.queryParamsNameFather
+                          },
+                          on: {
+                            action: function (record, id, actionType) {
+                              console.warn('action触发', record, id, actionType)
+                            }
+                          }
+                        })
+                      ]
+                    )
+                  }
                 })
                 vms.XFormTable = vm
                 dom.appendChild(vm.$mount().$el)
               },
-              // onUpdate 将会在数据更新时被调用
-              // dom 是 dom 节点、data 将包含表单所有数据，prevData 是之前表单的所有数据
-              onUpdate: (dom, data, prevData) => {
-                console.log('数据有变化', data)
-                const vm = vms.XFormTable
-                vm.$children[0].active(data)
+              onUpdate: (dom, data, prevData, props) => {
+                console.warn('AAA', vms)
+                Vue.set(vms.XFormTable, 'queryParamsNameFather', data.test_tree2)
               },
-              // onUnmount 将会在组件被销毁的时候调用，用于清理资源
               onUnmount: () => {
                 console.log('组件被销毁')
               },
             },
-          ],
-          id: 'u:e4e49c147c06'
+          ]
         }
       ],
     }