vue2-client 1.12.2 → 1.12.3-9.alpha.1

package/src/layouts/GridView.vue

@@ -1,45 +1,43 @@
-<template>
-  <div id="test">
-    <a-card :bordered="false">
-      <XReport
-        ref="main"
-        v-if="configName"
-        :use-oss-for-img="false"
-        :config-name="configName"
-        :show-img-in-cell="true"
-        :display-only="true"
-        :edit-mode="false"
-        :show-save-button="false"
-        :no-padding="true"
-        :dont-format="true"/>
-      <a-empty v-else/>
-    </a-card>
-  </div>
-</template>
-
-<script>
-import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport.vue'
-
-export default {
-  name: 'GridView',
-  components: {
-    XReport
-  },
-  mounted () {
-    // 获取当前路由中的meta
-    this.configName = this.$router.currentRoute.meta.configName
-    this.nothing = !this.configName
-  },
-  data () {
-    return {
-      configName: '',
-      nothing: false
-    }
-  },
-  methods: {
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <div id="test">
+    <a-card :bordered="false">
+      <XReport
+        ref="main"
+        v-if="configName"
+        :use-oss-for-img="false"
+        :config-name="configName"
+        :show-img-in-cell="true"
+        :display-only="true"
+        :edit-mode="false"
+        :dont-format="true"/>
+      <a-empty v-else/>
+    </a-card>
+  </div>
+</template>
+
+<script>
+import XReport from '@vue2-client/base-client/components/common/XReportGrid/XReport.vue'
+
+export default {
+  name: 'GridView',
+  components: {
+    XReport
+  },
+  mounted () {
+    // 获取当前路由中的meta
+    this.configName = this.$router.currentRoute.meta.configName
+    this.nothing = !this.configName
+  },
+  data () {
+    return {
+      configName: '',
+      nothing: false
+    }
+  },
+  methods: {
+  }
+}
+</script>
+<style scoped>
+
+</style>

package/src/logic/plugins/common/DateTools.js

@@ -1,3 +1,6 @@
+/**
+ * 日期工具类
+ */
 export default class DateTools {
   static instance = new DateTools()
 

package/src/logic/plugins/common/VueTools.js

@@ -0,0 +1,30 @@
+/**
+ * Vue工具类
+ */
+export default class VueTools {
+  static instance = new VueTools()
+
+  constructor () {
+    if (VueTools.instance) {
+      return VueTools.instance
+    }
+    VueTools.instance = this
+  }
+
+  static getInstance () {
+    if (!VueTools.instance) {
+      VueTools.instance = new VueTools()
+    }
+    return VueTools.instance
+  }
+
+  /**
+   * 获取组件实例
+   * @param vueRef vue实例
+   * @param componentName 组件实例名（refName）
+   * @returns {VueComponent}
+   */
+  getComponent (vueRef, componentName) {
+    return vueRef.$refs[componentName]
+  }
+}

package/src/logic/plugins/index.js

@@ -1,5 +1,7 @@
 import DateTools from '@vue2-client/logic/plugins/common/DateTools'
+import VueTools from '@vue2-client/logic/plugins/common/VueTools'
 
 export default {
-  dateTools: DateTools.getInstance()
+  dateTools: DateTools.getInstance(),
+  vueTools: VueTools.getInstance()
 }

package/src/pages/LogicCallExample/index.vue

@@ -2,6 +2,7 @@
 
 import LogicRunner from '@vue2-client/logic/LogicRunner'
 import { getCurrentInstance, ref } from 'vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
 
 const { proxy } = getCurrentInstance()
 
@@ -28,6 +29,15 @@ async function testLogic () {
     显示值：<span ref="displaySpan">{{ metaData.displayValue }}</span>
     <br/>
     <a-button @click="testLogic">修改</a-button>
+    <br/>
+    <p>调用组件方法</p>
+    <br/>
+    <x-form-table
+      ref="testFormTable"
+      serviceName="af-system"
+      :queryParamsName="'crud_dictionary_manage'"
+      title="字典">
+    </x-form-table>
   </div>
 </template>
 

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -1,32 +1,47 @@
-<script>
-import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
-
-export default {
-  name: 'WorkFlowDemo',
-  components: { WorkflowDetail },
-  mounted () {
-    this.$refs.workFlow.init({
-      workflowId: '9'
-    })
-  },
-  methods: {
-    /**
-     * 流程详情页成功
-     * @param note 备注信息
-     * @param form 表单信息
-     * @param workflowId
-     */
-    success ({ note, form, workflowId }) {
-      console.log('success', note, form, workflowId)
-    }
-  }
-}
-</script>
-
-<template>
-  <WorkflowDetail ref="workFlow" @success="success"></WorkflowDetail>
-</template>
-
-<style scoped lang="less">
-
-</style>
+<script>
+import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+
+export default {
+  name: 'WorkFlowDemo',
+  components: { WorkflowDetail },
+  mounted () {
+    this.$refs.workFlow.init({
+      workflowId: '194'
+    })
+  },
+  methods: {
+    /**
+     * 流程详情页成功
+     * @param note 备注信息
+     * @param form 表单信息
+     * @param workflowId
+     */
+    success ({ note, form, workflowId }) {
+      console.log('success', note, form, workflowId)
+    },
+    /**
+     * 流程详情页成功
+     * @param note 备注信息
+     * @param form 表单信息
+     * @param workflowId 工作流id
+     * @param fromStepId 起ID
+     * @param toStepId 往ID
+     * @param successStepId 完成步骤id
+     * @param successStep 完成步骤名称
+     * @param fromStep 起步骤名称
+     * @param toStep 往步骤名称
+     */
+    nextClick ({ note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep }) {
+      console.log('success', note, form, workflowId, fromStepId, toStepId, fromStep, toStep, successStepId, successStep)
+    }
+  }
+}
+</script>
+
+<template>
+  <WorkflowDetail ref="workFlow" @success="success" @nextClick="nextClick"></WorkflowDetail>
+</template>
+
+<style scoped lang="less">
+
+</style>

package/src/pages/WorkflowDetail/WorkflowDetail.vue

@@ -36,6 +36,7 @@
                 :details="details"
                 @refresh="stepChanged"
                 @success="success"
+                @nextClick="nextClick"
               />
             </a-tab-pane>
             <a-tab-pane key="2" tab="任务流转记录">
@@ -193,6 +194,10 @@ export default {
     success (res) {
       this.visible = false
       this.$emit('success', res)
+    },
+    // 提交完成后事件
+    nextClick (res) {
+      this.$emit('nextClick', res)
     }
   }
 }