vue2-client 1.9.67 → 1.9.69

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

@@ -31,6 +31,7 @@ this.openDialog('xxx', 5, {}, {}, {})
 - refreshTable 重新查询
 - clearRowKeys 清除选中的行
 - getTableData() 获取全部数据
+- Object.assign(this.fixedQueryForm, data) 给查询条件传值
 - 事件相关
   - afterSubmit( type(新增/修改/擦和讯), id: (所操作的主键id), form: (请求的表单内容))  提交后触发
   - afterQuery( res (查询后数据), querparams (查询参数)) 查询后触发

package/package.json

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

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

@@ -8,7 +8,7 @@
     <a-badge v-else color="#D9D9D9" :text="!isExternalText ? dictionary.text: null"/>
     <span v-if="isExternalText">{{ dictionary.text }}</span>
   </div>
-  <div v-else-if="dictionary">
+  <div v-else-if="dictionary" :class="{data_card: dataCard}">
     <!-- 徽标为none时 -->
     {{ dictionary.text }}
   </div>
@@ -46,6 +46,11 @@ export default {
     isExternalText: {
       type: Boolean,
       required: false
+    },
+    // 是否在看板模式下显示
+    dataCard: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {},
@@ -83,4 +88,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.data_card {
+  display: inline;
+}
 </style>

package/src/base-client/components/common/XButtons/XButtonDemo.vue

@@ -1,11 +1,12 @@
 <template>
   <div>
-    <x-buttons></x-buttons>
+    <x-buttons ref="xButtons"></x-buttons>
   </div>
 </template>
 
 <script>
   import XButtons from './XButtons.vue'
+  import { getConfigByName } from '@/services/api/common'
 
   export default {
     name: 'XButtonDemo',
@@ -13,9 +14,14 @@
         XButtons
     },
     data () {
-      return {
-        configName: 'drugInventAuditTab'
-      }
+      return {}
+    },
+    mounted () {
+      getConfigByName('testButtonGroup', 'af-his', res => {
+        this.$refs.xButtons.init({
+          renderConfig: res
+        })
+      }, true)
     },
     methods: {},
   }

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

@@ -1,145 +1,66 @@
 <template>
   <div class="x-buttons">
-    <a-button-group>
+    <a-button-group v-if="loading">
       <a-button
-        v-for="(button, index) in config"
-        :key="index"
+        v-for="(button) in renderConfig"
+        :key="button.key"
+        :ref="'buttonGroup-' + button.key"
         :type="button.type || 'default'"
-        :danger="button.danger"
         :disabled="button.disabled"
-        :ghost="button.ghost"
-        :href="button.href"
-        :html-type="button.htmlType"
         :icon="button.icon"
         :loading="button.loading"
-        :shape="button.shape"
-        :size="button.size"
-        :target="button.target"
-        @click="handleButtonClick(index)"
+        @click="handleButtonClick(button)"
       >
         {{ button.label }}
       </a-button>
     </a-button-group>
+    <a-spin :spinning="!loading" />
   </div>
 </template>
 
 <script>
-import { Button, Icon as AIcon } from 'ant-design-vue'
-import { getConfigByName } from '@vue2-client/services/api/common'
-
 export default {
   name: 'XButtons',
-  components: {
-    'a-button': Button,
-    'a-icon': AIcon,
-  },
-  props: {
-    configName: {
-      type: String,
-      default: undefined
-    }
-  },
+  components: {},
+  props: {},
   data () {
     return {
-      // 配置
-      config: [
-        {
-          label: 'Primary Button',
-          type: 'primary',
-          icon: 'rocket',
-          disabled: false,
-          loading: false,
-          danger: false,
-          ghost: false,
-          href: '',
-          htmlType: 'button',
-          shape: 'default',
-          size: 'middle',
-          target: '',
-          onClick: () => {}
-        },
-        {
-          label: 'Danger Button',
-          type: 'default',
-          icon: 'fire',
-          disabled: false,
-          loading: false,
-          danger: true,
-          ghost: false,
-          href: '',
-          htmlType: 'button',
-          shape: 'default',
-          size: 'middle',
-          target: '',
-          onClick: () => {}
-        },
-        {
-          label: 'Ghost Button',
-          type: 'ghost',
-          icon: 'ghost',
-          disabled: false,
-          loading: false,
-          danger: false,
-          ghost: true,
-          href: '',
-          htmlType: 'button',
-          shape: 'default',
-          size: 'middle',
-          target: '',
-          onClick: () => {}
-        },
-        {
-          label: 'Dashed Button',
-          type: 'dashed',
-          icon: 'ellipsis',
-          disabled: false,
-          loading: false,
-          danger: false,
-          ghost: false,
-          href: '',
-          htmlType: 'button',
-          shape: 'default',
-          size: 'middle',
-          target: '',
-          onClick: () => {}
-        },
-        {
-          label: 'Link Button',
-          type: 'link',
-          icon: 'link',
-          disabled: false,
-          loading: false,
-          danger: false,
-          ghost: false,
-          href: '#',
-          htmlType: 'button',
-          shape: 'default',
-          size: 'middle',
-          target: '_blank',
-          onClick: () => {}
-        }
-      ],
+      // 组件加载状态
+      loading: false,
+      // 配置内容
+      renderConfig: undefined
     }
   },
   methods: {
-    handleButtonClick (index) {
-      // 在这里处理点击事件，或者 emit 一个事件到父组件
-      this.$emit('button-click', this.config[index])
+    /**
+     * 初始化按钮组参数
+     */
+    init (params) {
+      const {
+        // 配置内容
+        value
+      } = params
+      this.renderConfig = value
+      this.loading = true
     },
-  },
-  watch: {
-    configName: {
-      deep: true,
-      immediate: true,
-      handler (val) {
-        console.log('>>>>点击按钮进入')
-        if (val) {
-          getConfigByName(this.configName, undefined, res => {
-            this.config = res.data || this.config
-          })
-        }
+    handleButtonClick (item) {
+      item.loading = true
+      const callback = () => {
+        item.loading = false
+      }
+      if (item.clickEventName && this.$listeners[item.clickEventName]) {
+        // 交由父级处理
+        this.$emit(item.clickEventName, item, callback)
+      } else {
+        this.defaultAction(item.clickEventName, item, callback)
       }
+    },
+    defaultAction (clickEventName, item, callback) {
+      setTimeout(() => {
+        this.$message.warn(`已触发按钮 [${item.key}]，注册事件名 [${clickEventName}]，未实现事件函数`)
+        callback()
+      }, 200)
     }
-  },
+  }
 }
 </script>

package/src/base-client/components/common/XButtons/index.md

@@ -0,0 +1,61 @@
+# XButtons
+
+通用按钮组控件
+
+
+## 何时使用
+
+当需要一个通用按钮组时
+
+
+引用方式：
+
+```javascript
+import XButtons from '@vue2-client/base-client/components/XButtons/XButtons'
+
+export default {
+    components: {
+      XButtons
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<template>
+  <div>
+    <x-buttons ref="xButtons"></x-buttons>
+  </div>
+</template>
+
+<script>
+  import XButtons from './XButtons.vue'
+  import { getConfigByName } from '@/services/api/common'
+
+  export default {
+    name: 'XButtonDemo',
+    components: {
+      XButtons
+    },
+    data () {
+      return {}
+    },
+    mounted () {
+      getConfigByName('testButtonGroup', 'af-his', res => {
+        this.$refs.xButtons.init({
+          renderConfig: res
+        })
+      }, true)
+    },
+    methods: {},
+  }
+</script>
+```
+
+## API
+
+| 参数        | 说明                       | 类型      | 默认值  |
+|-----------|--------------------------|---------|------|

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

@@ -20,6 +20,22 @@
                   </div>
                   <div class="progress-num">{{ card[item.key] * 100 }}%</div>
                 </template>
+                <template v-else-if="item.type === 'custom' && tableColumns">
+                  <!-- 根据 tableColumns 显示自定义内容 -->
+                  <span v-for="column in tableColumns" v-if="column.dataIndex === item.key" :key="column.dataIndex">
+                    <template v-if="column.slotType === 'badge'">
+                      <x-badge
+                        :service-name="serviceName"
+                        :env="env"
+                        :dataCard="true"
+                        :badge-key="column.slotKeyMap"
+                        :value="card[item.key]"/>
+                    </template>
+                    <template v-else>
+                      <slot :name="column.slots.customRender">{{ card[item.key] }}</slot>
+                    </template>
+                  </span>
+                </template>
                 <template v-else>
                   <span class="body-item-value">{{ card[item.key] }}</span>
                 </template>
@@ -92,9 +108,13 @@
 </template>
 
 <script>
+import XBadge from '@vue2-client/base-client/components/common/XBadge'
 
 export default {
   name: 'XDataCard',
+  components: {
+    XBadge,
+  },
   props: {
     // 卡片数据更新方法
     cardData: {
@@ -123,6 +143,18 @@ export default {
     tableColumns: {
       type: Array,
       default: undefined
+    },
+    // 服务名称
+    serviceName: undefined,
+    // 当前环境
+    env: {
+      type: String,
+      default: 'prod'
+    },
+    // 初始是否加载数据
+    createdQuery: {
+      type: Boolean,
+      default: true
     }
   },
   data () {
@@ -194,7 +226,9 @@ export default {
 
     // 数据初始化
     if (this.cardData) {
-      this.loadData()
+      if (this.createdQuery) {
+        this.loadData()
+      }
     } else {
       this.data = {
         one: '无数据',

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

@@ -1,6 +1,6 @@
 <template>
   <div :style="{marginBottom: !visible ? '12px':''}">
-    <div v-show="visible && realJsonData.length > 0" class="table-page-search-wrapper">
+    <div v-if="visible && realJsonData.length > 0" class="table-page-search-wrapper">
       <a-form-model
         v-if="loaded"
         ref="form"

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

@@ -88,6 +88,7 @@
 <script>
 // 转PDF用
 import HtmlToPdf from '@vue2-client/utils/htmlToPDF'
+import { mapState } from 'vuex'
 import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
 import XReportDesign from './XReportDesign.vue'
 import { printElement } from './print'
@@ -262,7 +263,8 @@ export default {
       registerComponent: this.registerComponent,
       getComponentByName: this.getComponentByName,
       getParentComponentByName: this.getComponentByName,
-      getConfigByName: getConfigByName
+      getConfigByName: getConfigByName,
+      currUser: this.currUser
     }
   },
   methods: {
@@ -925,6 +927,9 @@ export default {
       }, this.env === 'dev')
     }
   },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
   mounted () {
     // 如果外界传来了registerMap，我们将本VM对象注册到map中
     if (this.registerMap !== undefined) {

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

@@ -15,7 +15,7 @@
             <!-- 插槽渲染 -->
             <template v-if="cell.type === 'slot'">
               <template
-                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report'].includes(cell.slotType)">
+                v-if="['x-form-table','x-add-native-form','x-tree-pro', 'x-his-editor', 'x-tab', 'x-form-group', 'x-report', 'x-buttons'].includes(cell.slotType)">
                 <component
                   :is="getComponentName(cell.slotConfig, cell.serviceName, cell.slotType)"
                   :key="cellIndex"
@@ -415,7 +415,8 @@ export default {
     XTreePro: () => import('@vue2-client/base-client/components/common/XTree/XTreePro.vue'),
     XHisEditor: () => import('@vue2-client/base-client/components/his/XHisEditor/XHisEditor.vue'),
     XTab: () => import('@vue2-client/base-client/components/common/XTab/XTab.vue'),
-    XReport: () => import('@vue2-client/base-client/components/common/XReport/XReport.vue')
+    XReport: () => import('@vue2-client/base-client/components/common/XReport/XReport.vue'),
+    XButtons: () => import('@vue2-client/base-client/components/common/XButtons/XButtons.vue')
   },
   props: {
     // 每一行的配置
@@ -567,6 +568,14 @@ export default {
               showLeftTab: true,
             })
           }, this.env === 'dev')
+        } else if (cell.slotType === 'x-buttons') {
+          // 按钮组需要主动调用初始化方法
+          getConfigByName(cell.slotConfig, cell.serviceName, (res) => {
+            this.$refs[`dynamicComponent_${cell.slotRef || cellIndex}`][0].init({
+              ...res,
+              serviceName: cell.serviceName,
+            })
+          }, this.env === 'dev')
         }
       }
       if (cell.slotType === 'x-report') {

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

@@ -212,7 +212,10 @@
         :tableColumns="tableColumns"
         :card-config="cardModeConfig"
         :show-pagination="true"
+        :serviceName="serviceName"
         :card-data="loadData"
+        :env="env"
+        :createdQuery="createdQuery"
         :simple-mode="simpleMode"/>
     </template>
     <!-- 上传文件 -->
@@ -673,7 +676,7 @@ export default {
       this.scrollXWidth = totalWidth
       // 加载筛选列完成
       this.columnSelectLoaded = true
-      this.setQueryForm(form || {}, createdQuery)
+      this.setQueryForm(form || {})
     },
     // 操作面板按钮渲染
     buttonRendering (button) {
@@ -763,9 +766,9 @@ export default {
     /**
      * 为表格附加查询条件
      */
-    setQueryForm (form = {}, createdQuery = true) {
+    setQueryForm (form = {}) {
       this.form = form
-      if (createdQuery) {
+      if (this.createdQuery) {
         this.refresh(true)
       }
     },

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

@@ -89,6 +89,7 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
           meta: {
               // 菜单中不显示
               invisible: true,