vue2-client 1.9.63 → 1.9.65

package/package.json

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

@@ -223,18 +223,25 @@ export default {
     getConfigByName,
     init (params) {
       const {
-        configName, configContent, formItems, formJson, viewMode, isHandleFormKey = true,
+        configName, configContent, formItems, formJson, viewMode, isHandleFormKey, isKeyHandle = true,
         showSubmitBtn = true, serviceName,
         modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {},
         simpleFormJsonData = {}, env = 'prod', layout, xAddFormLayout = 'horizontal'
       } = params
       this.loaded = false
       // 兼容需要省略 传递 layout: res.xAddFormLayout 可以使用 ...res 展开运算符 直接转递
-      if (xAddFormLayout && !layout) {
+      if (xAddFormLayout && layout === undefined) {
         this.layout = xAddFormLayout
       } else {
         this.layout = layout
       }
+      if (isHandleFormKey && !isKeyHandle) {
+        this.isHandleFormKey = isKeyHandle
+      } else if (isHandleFormKey) {
+        this.isHandleFormKey = isHandleFormKey
+      } else {
+        this.isHandleFormKey = isKeyHandle
+      }
       this.configName = configName
       this.configContent = configContent
       this.formItems = this.getFromItem(formItems, formJson)

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

@@ -83,7 +83,8 @@ export default {
       },
       isInAModal: () => {
         return true
-      }
+      },
+      currUser: this.currUser
     }
   },
   inject: ['getParentComponentByName'],

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

@@ -0,0 +1,145 @@
+<template>
+  <div class="x-buttons">
+    <a-button-group>
+      <a-button
+        v-for="(button, index) in config"
+        :key="index"
+        :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)"
+      >
+        {{ button.label }}
+      </a-button>
+    </a-button-group>
+  </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
+    }
+  },
+  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: () => {}
+        }
+      ],
+    }
+  },
+  methods: {
+    handleButtonClick (index) {
+      // 在这里处理点击事件，或者 emit 一个事件到父组件
+      this.$emit('button-click', this.config[index])
+    },
+  },
+  watch: {
+    configName: {
+      deep: true,
+      immediate: true,
+      handler (val) {
+        console.log('>>>>点击按钮进入')
+        if (val) {
+          getConfigByName(this.configName, undefined, res => {
+            this.config = res.data || this.config
+          })
+        }
+      }
+    }
+  },
+}
+</script>

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

@@ -0,0 +1,3 @@
+import XButtons from './XButtons.vue'
+
+export default XButtons

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

@@ -11,7 +11,7 @@
           <div class="body">
             <template v-for="(item, bodyIndex) in config.content" v-if="bodyIndex < 6">
               <div :key="'body' + bodyIndex" class="body-item">
-                <span class="body-item-label">{{ item.label }}:</span>
+                <span class="body-item-label">{{ item.label }}：</span>
                 <template v-if="item.type === 'progress'">
                   <div class="progress">
                     <div class="progress-bar">
@@ -119,6 +119,10 @@ export default {
     simpleMode: {
       type: Boolean,
       default: false
+    },
+    tableColumns: {
+      type: Array,
+      default: undefined
     }
   },
   data () {
@@ -284,20 +288,19 @@ export default {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-between;
+  overflow-y: auto;
+  max-height: 85vh;
 
   .data-card {
-    width: 15vw;
-    margin: 10px 0;
+    width: 100%;
     border: 2px solid rgb(244,244,244);
     border-radius: 5px;
-    margin-bottom: 1%;
+    margin-bottom: 10px;
 
     .header {
-      height: 30px;
       width: 100%;
       background-color: rgb(244,244,244);
-      padding-top: 3%;
-      padding-left: 5%;
+      padding: 5px 15px;
 
       span {
         font-weight: bold;
@@ -306,28 +309,21 @@ export default {
     }
 
     .body {
-      width: 100%;
-      padding: 3%;
-
       .body-item {
-        height: 20px;
+        padding: 5px 15px;
       }
 
       .body-split {
-        padding-bottom: 1%;
-        margin: 1%;
+        margin: 1px 0;
       }
 
       .body-item-label {
         color: rgba(117, 117, 117, 0.8);
         font-size: 0.95em;
-        padding-left: 1.5%;
       }
 
       .body-item-value {
-        padding-right: 1.5%;
         color: black;
-        float: right;
       }
 
       .progress {
@@ -364,13 +360,10 @@ export default {
     }
 
     .footer {
-      height: 35px;
-      width: 100%;
+      padding: 5px 15px;
       background-color: rgb(244,244,244);
-      padding-top: 5%;
-
       .footer-icon {
-        margin-right: 3%;
+        margin-right: 5px;
       }
 
       .footer-item-split {
@@ -380,7 +373,6 @@ export default {
       .footer-item {
         color: rgba(117, 117, 117, 0.8);
         font-size: 1em;
-        text-align: center;
       }
 
       .footer-item:hover {

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

@@ -138,7 +138,7 @@ export default {
     XAddReport,
     XImportExcel
   },
-  inject: ['getSelectedId', 'getSelectedData', 'getMixinData', 'getOutEnv'],
+  inject: ['getSelectedId', 'getSelectedData', 'getMixinData', 'getOutEnv', 'currUser'],
   data () {
     return {
       // 加载状态

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

@@ -26,11 +26,17 @@
 <script>
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
 import { microDispatch } from '@vue2-client/utils/microAppUtils'
+import { mapState } from 'vuex'
 export default {
   name: 'Demo',
   components: {
     XFormTable
   },
+  provide () {
+    return {
+      currUser: this.currUser
+    }
+  },
   data () {
     return {
       // 查询配置文件名
@@ -60,6 +66,7 @@ export default {
     }
   },
   computed: {
+    ...mapState('account', { currUser: 'user' })
   },
 }
 </script>

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

@@ -77,7 +77,8 @@ export default {
       },
       isInAModal: () => {
         return true
-      }
+      },
+      currUser: this.currUser
     }
   },
   inject: ['getParentComponentByName'],

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

@@ -504,6 +504,9 @@ export default {
   color: #000;
   // background-color: #fff;
   border-radius: 8px;
+  height: 85vh;
+  overflow-y: auto;
+  overflow-x: hidden;
 
   .reportTitle {
     font-weight: bold;

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

@@ -1,10 +1,11 @@
 <template>
-  <a-row type="flex" :gutter="gutter">
+  <a-row type="flex" :gutter="gutter" style="margin-bottom: 20px;">
     <!--  预览页展示  -->
     <template v-if="display">
       <template v-if="!inputColumns">
         <a-col
           name="trGroup"
+          style="flex: 1;"
           v-for="(cell, cellIndex) in columns"
           v-if="!cell.dontShowRow"
           :key="cellIndex"
@@ -502,7 +503,7 @@ export default {
       // tableConfig: {}
     }
   },
-  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv'],
+  inject: ['openDialog', 'registerComponent', 'getComponentByName', 'runLogic', 'getMixinData', 'getSelectedId', 'isInAModal', 'getConfigByName', 'getSelectedData', 'getOutEnv', 'currUser'],
   methods: {
     getWindow,
     isMicroAppEnv,
@@ -982,6 +983,7 @@ export default {
   background: #b37feb;
 }
 .flexItem {
-  border-radius: 4px;
+  border-radius: 8px;
+  height: 100%;
 }
 </style>

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

@@ -30,6 +30,7 @@ import { getConfigByName, getConfigByNameAsync, runLogic } from '@vue2-client/se
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import { getRealKeyData } from '@vue2-client/utils/util'
 import { getMicroData, getWindow, isMicroAppEnv, microDispatch } from '@vue2-client/utils/microAppUtils'
+import { mapState } from 'vuex'
 
 export default {
   name: 'XTab',
@@ -39,6 +40,11 @@ export default {
     XReportGrid: () => import('@vue2-client/base-client/components/common/XReportGrid/XReport.vue')
   },
   inject: ['isInAModal', 'getSelectedId', 'getSelectedData', 'getOutEnv'],
+  provide () {
+    return {
+      currUser: this.currUser
+    }
+  },
   data () {
     return {
       activeKey: 0,
@@ -46,6 +52,9 @@ export default {
       config: undefined,
     }
   },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
   methods: {
     // 自定义函数中调用的方法  这个不能删
     getWindow,

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

@@ -209,6 +209,7 @@
       <XDataCard
         ref="table"
         @cardEmit="handleCardEmit"
+        :tableColumns="tableColumns"
         :card-config="cardModeConfig"
         :show-pagination="true"
         :card-data="loadData"

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

@@ -87,7 +87,7 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // 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/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           meta: {
               // 菜单中不显示