vue2-client 1.9.1 → 1.9.3

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

@@ -5,7 +5,7 @@
 
 # 通过this可以调用的函数
 - openDialog(configName, selectedId, mixinData, outEnv)：打开一个对话框：
-* selectId：id号，formtable选择时，用selectId过滤数据
+* selectId：id号，formtable选择时，用selectId过滤数据 可以传递 json {a_id: 1} 或者 传递 1  ，传递数值会默认拼接查询条件 {selected_id:1}
 * mixinData: form表单需要的数据
 * outEnv: 传递给打开的界面的数据，在打开界面的js中通过this.outEnv可以访问
 ```js

package/package.json

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

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

@@ -68,7 +68,7 @@ export default {
     },
     provide () {
       return {
-        getSelectedId: () => { return this.selectedId },
+        getSelectedId: () => this.getSelectedId(),
         getMixinData: () => { return this.mixinData },
         isInAModal: () => { return true }
       }
@@ -100,6 +100,15 @@ export default {
         // 把打开时的环境传递给打开窗口，以便js脚本中使用
         this.outEnv = outEnv
       },
+      getSelectedId () {
+        if (typeof this.selectedId === 'object') {
+          if (Object.keys(this.selectedId) > 0) {
+            return this.selectedId[Object.keys(this.selectedId)[0]]
+          }
+        } else {
+          return this.selectedId
+        }
+      },
       selectRow (selectedRowKeys, selectedRows) {
         this.table_selectedRowKeys = selectedRowKeys
         this.table_selectedRows = selectedRows

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

@@ -608,10 +608,16 @@ export default {
     }
   },
   mounted () {
-    if (this.getSelectedId && this.getSelectedId()) {
-      console.log('注入数据', this.getSelectedId()) // 访问祖先组件的数据
-      Object.assign(this.fixedAddForm, { selected_id: this.getSelectedId() })
-      Object.assign(this.fixedQueryForm, { selected_id: this.getSelectedId() })
+    if (this.getSelectedId && typeof this.this.getSelectedId === 'function') {
+      const selectedId = this.getSelectedId()
+      console.log('注入数据', selectedId)
+      if (typeof selectedId === 'object') {
+        Object.assign(this.fixedAddForm, selectedId)
+        Object.assign(this.fixedQueryForm, selectedId)
+      } else {
+        Object.assign(this.fixedAddForm, { selected_id: selectedId })
+        Object.assign(this.fixedQueryForm, { selected_id: selectedId })
+      }
     }
   }
 }

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

@@ -504,16 +504,21 @@ export default {
           // 如果配置了 表单初始化logic
           // 调用 logic 获取参数
           let param = { ...this.mixinData }
+          let selectedId
           if (res.paramLogicName) {
-            param = Object.assign(param, await runLogic(res.paramLogicName, {
-              selectedId: (!!this.getSelectedId && this.getSelectedId()) || undefined,
-            }, cell.serviceName))
+            if (!!this.getSelectedId) {
+              selectedId = this.getSelectedId()
+              if (typeof selectedId !== 'object') {
+                selectedId = { selectedId: selectedId }
+              }
+            }
+            param = Object.assign(param, await runLogic(res.paramLogicName, selectedId, cell.serviceName))
           }
           this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
             serviceName: cell.serviceName,
             formItems: res.formJson,
             showSubmitBtn: !this.isInAModal,
-            businessType: '新增',
+            businessType: param.businessType || '新增',
             layout: res.xAddFormLayout,
             ...res,
             fixedAddForm: param,

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

@@ -82,11 +82,15 @@ export default {
           // 如果配置了 表单初始化logic
           // 调用 logic 获取参数
           let param = {}
+          let selectedId
           if (res.paramLogicName) {
-            param = Object.assign(param, await runLogic(res.paramLogicName, {
-              selectedId: (!!this.getSelectedId && this.getSelectedId()) || undefined,
-              ...this.mixinData
-            }, tab.serviceName))
+            if (!!this.getSelectedId) {
+              selectedId = this.getSelectedId()
+              if (typeof selectedId !== 'object') {
+                selectedId = { selectedId: selectedId }
+              }
+            }
+            param = Object.assign(param, await runLogic(res.paramLogicName, selectedId, tab.serviceName))
           }
           this.$refs[`tab_com_${tab.slotType}_${index}`][0].init({
             formItems: res.formJson,

package/vue.config.js

@@ -11,11 +11,11 @@ const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
 // v4 产品演示
-const v3Server = 'http://aote-office.8866.org:31567'
+const v3Server = 'http://192.168.11.160:31467/'
 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://192.168.11.160:31467/'
 // const OSSServerProd = 'http://192.168.50.67:31351'
 // const testUploadLocal = 'http://127.0.0.1:9001'
 // v3 铜川