vue2-client 1.9.4 → 1.9.6

package/package.json

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

@@ -302,7 +302,7 @@ export default {
       return start
     },
     setFormProps (formData, item, groupItem) {
-      if (!formData[item.model]) {
+      if (formData[item.model] === undefined || formData[item.model] === null) {
         formData[item.model] = undefined
       }
       if (!formData[item.model] && item.formDefault) {

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

@@ -69,6 +69,7 @@ export default {
     provide () {
       return {
         getSelectedId: () => this.getSelectedId(),
+        getSelectedData: () => { return this.selectedId },
         getMixinData: () => { return this.mixinData },
         isInAModal: () => { return true }
       }

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

@@ -134,7 +134,7 @@ export default {
     XAddReport,
     XImportExcel
   },
-  inject: ['getSelectedId', 'getMixinData'],
+  inject: ['getSelectedId', 'getSelectedData', 'getMixinData'],
   data () {
     return {
       // 加载状态
@@ -608,8 +608,8 @@ export default {
     }
   },
   mounted () {
-    if (this.getSelectedId && typeof this.getSelectedId === 'function') {
-      const selectedId = this.getSelectedId()
+    if (this.getSelectedData && typeof this.getSelectedData === 'function') {
+      const selectedId = this.getSelectedData()
       console.log('注入数据', selectedId)
       if (typeof selectedId === 'object') {
         Object.assign(this.fixedAddForm, selectedId)

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

@@ -490,7 +490,7 @@ export default {
       // tableConfig: {}
     }
   },
-  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName'],
+  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData'],
   methods: {
     onComponentMounted (h, cell, cellIndex) {
       if (this.getMixinData && this.getMixinData()) {

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

@@ -36,7 +36,7 @@ export default {
     XAddNativeForm: () => import('@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'),
     XReportGrid: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue')
   },
-  inject: ['isInAModal', 'getSelectedId'],
+  inject: ['isInAModal', 'getSelectedId', 'getSelectedData'],
   data () {
     return {
       activeKey: 0,

package/vue.config.js

@@ -52,8 +52,8 @@ module.exports = {
         changeOrigin: true
       },
       '/api/af-revenue': {
-        pathRewrite: { '^/api/af-revenue/': '/' },
-        target: 'http://127.0.0.1:9026',
+        // pathRewrite: { '^/api/af-revenue/': '/' },
+        target: revenue,
         changeOrigin: true
       },
       '/api/af-gaslink': {