vue2-client 1.14.91 → 1.14.92

package/package.json

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

package/src/pages/WorkflowDetail/WorkFlowDemo2.vue

@@ -27,9 +27,9 @@
       ref="workFlow"
       @success="success"
       @x-form-item-emit-func="handleFormItemEvent"
-      @address-selected="handleAddressSelected"
     >
     </WorkflowDetail>
+    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
   </a-card>
 </template>
 
@@ -39,13 +39,15 @@ import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XF
 import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
+import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
 
 export default {
   name: 'Apply',
   components: {
     XFormTable,
     XAddNativeForm,
-    WorkflowDetail
+    WorkflowDetail,
+    AddressSelect
   },
   data () {
     return {
@@ -94,11 +96,11 @@ export default {
     handleFormItemEvent (func, data, value) {
       console.log('打印一下：', func, data, value)
       if (func === 'selectAddress') {
-        this.$refs.workFlow.openAddressSelect()
+        this.$refs.addressSelect.setFormShow()
       }
     },
-    handleAddressSelected (record) {
-      this.$refs.workFlow.setAddress({ address: record.f_address })
+    setForm (record) {
+      this.$refs.workFlow.setFormValue({ address: record.f_address })
     }
   }
 }

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -49,7 +49,6 @@
                   @success="success"
                   @nextClick="nextClick"
                   @x-form-item-emit-func="handleFormItemEvent"
-                  @address-selected="handleAddressSelected"
                   class="handle-content"
                 />
               </template>
@@ -154,7 +153,7 @@ export default {
       visible: false
     }
   },
-  expose: ['setAddress', 'openAddressSelect'],
+  expose: ['setFormValue'],
   computed: {
     ...mapState('account', { currUser: 'user' }),
     ...mapState('setting', ['isMobile'])
@@ -249,15 +248,8 @@ export default {
     handleFormItemEvent (func, data, value) {
       this.$emit('x-form-item-emit-func', func, data, value)
     },
-    handleAddressSelected (record) {
-      this.$emit('address-selected', record)
-    },
-    // 选择地址弹出框方法
-    openAddressSelect () {
-      this.$refs.workflowHandle.$refs.addressSelect.setFormShow()
-    },
     // 给地址选择表单项赋值
-    setAddress (record) {
+    setFormValue (record) {
       this.$refs.workflowHandle.$refs.xAddForm.setForm(record)
     }
   }

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -215,7 +215,6 @@
         </a-tab-pane>
       </a-tabs>
     </template>
-    <address-select ref="addressSelect" @selAddress="setFormValue"></address-select>
   </div>
 </template>
 
@@ -239,7 +238,6 @@ import * as util from '@vue2-client/utils/util'
 import { getConfigByNameAsync, runLogic } from '@vue2-client/services/api/common'
 import XTab from '@vue2-client/base-client/components/common/XTab/XTab.vue'
 import WorkFlowPreview from './WorkFlowPreview'
-import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
 
 export default {
   name: 'WorkFlowHandle',
@@ -253,8 +251,7 @@ export default {
     FilePreview,
     FileItem,
     ImageItem,
-    WorkFlowPreview,
-    AddressSelect
+    WorkFlowPreview
   },
   computed: {
     ...mapState('account', { currUser: 'user' }),
@@ -1042,9 +1039,6 @@ export default {
     },
     formItemEmitFunc (func, data, value) {
       this.$emit('x-form-item-emit-func', func, data, value)
-    },
-    setFormValue (record) {
-      this.$emit('address-selected', record)
     }
   },
   watch: {}

package/src/pages/addressSelect/index.vue

@@ -60,7 +60,7 @@ export default {
         f_address_id: record.tua_id
       }
       console.log('选择了地址是', form)
-      this.$emit('selAddress', form)
+      this.$emit('setAddress', form)
       this.selectAddressVisible = false
     },
     addAddress () {

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

@@ -55,7 +55,7 @@ routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynami
 routerResource.example = {
   path: 'example',
   name: '示例主页面',
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
+  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
@@ -70,7 +70,7 @@ routerResource.example = {
   // component: () => import('@vue2-client/base-client/components/his/XTimeSelect/XTimeSelectDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  component: () => import('@vue2-client/pages/XPageViewExample/index.vue'),
+  // component: () => import('@vue2-client/pages/XPageViewExample/index.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),