vue2-client 1.9.177 → 1.9.179

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.177",
+  "version": "1.9.179",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
@@ -24,7 +24,7 @@
     "@hufe921/canvas-editor": "^0.9.49",
     "@vue/babel-preset-jsx": "^1.4.0",
     "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.60",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.61",
     "animate.css": "^4.1.1",
     "ant-design-vue": "^1.7.8",
     "axios": "^0.27.2",

package/src/base-client/components/common/XDatePicker/index.vue

@@ -162,11 +162,9 @@ export default {
   methods: {
     moment,
     openChange (status) {
-      console.log(status)
       this.yearShowOne = status
     },
     RangePanelChange (value, mode) {
-      console.log(value, this.formatType, this.attr.type)
       this.localValue = [
         moment(value[0]).format(this.formatType),
         moment(value[1]).format(this.formatType),

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

@@ -507,7 +507,7 @@ export default {
             buttonPermissions: res.buttonPermissions,
             editButtonStateData: res.editButtonStateData,
             printTemplate: res.printTemplate,
-            title: this.title,
+            title: this.title || res.title,
             viewMode: this.viewMode,
             localEditMode: localEditMode,
             formSubmitTypeInLocalEditMode: res.formSubmitTypeInLocalEditMode,
@@ -638,7 +638,7 @@ export default {
       const localEditMode = !this.localEditMode ? res.localEditMode : this.localEditMode
       this.$refs.xAddForm.init({
         businessType: '新增',
-        title: this.title,
+        title: this.title || res.title,
         isShow: !res.buttonState || res.buttonState.add || res.buttonState.edit,
         configName: this.queryParamsName,
         configContent: this.queryParamsJson,
@@ -681,7 +681,7 @@ export default {
         const localEditMode = !this.localEditMode ? res.localEditMode : this.localEditMode
         this.$refs.xAddForm.init({
           businessType: '修改',
-          title: this.title,
+          title: this.title || res.title,
           isShow: !res.buttonState || res.buttonState.add || res.buttonState.edit,
           configName: this.queryParamsName,
           configContent: this.queryParamsJson,

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

@@ -25,7 +25,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'DayReportQueryCRUD',
+      queryParamsName: 'ChargeQueryCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值

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

@@ -108,6 +108,7 @@ export default {
         // 如果模板中有默认表格 使用当前选中字段替换表格内容
         const crudTableIndex = res.panels[0].printElements.findIndex(h => h.printElementType?.type === 'table' && h.options.field === 'CRUD_TABLE')
         if (crudTableIndex !== -1) {
+          console.log()
           res.panels[0].printElements[crudTableIndex].options.columns = [tHeader.map((title, index) => {
             return {
               colspan: 1,
@@ -117,7 +118,8 @@ export default {
               width: res.panels[0].printElements[crudTableIndex].options.width / tHeader.length,
               checked: true,
               fixed: false,
-              title: title
+              title: title,
+              tableSummary: this.tableContext.summaryData.find(item => item.title === title) ? 'sum' : undefined
             }
           })]
         }

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

@@ -70,7 +70,7 @@
               </a-menu>
               <a-button>导出 <a-icon type="down" :style="iconStyle"/> </a-button>
             </a-dropdown>
-            <a-dropdown v-if="!buttonState || buttonState.print && buttonRendering('print')">
+            <a-dropdown>
               <a-menu slot="overlay">
                 <a-menu-item :disabled="selectedRowKeys.length === 0" key="1" @click="handlePrint('selected')"><a-icon
                   :style="iconStyle"