ocpview-plus 1.0.2 → 1.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ocpview-plus",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "title": "ocpviewPlus",
   "description": "A high quality Service UI components Library with Vue.js",
   "homepage": "",

package/src/components/masterplate/RewriteBillListDetails/BillInfoPanelEditTable.vue

@@ -90,12 +90,12 @@
                 <vxe-grid
                     ref="table"
                     keep-source
-                    border="inner"
+                    border="full"
                     style="width: 100%"
                     :columns="RewriteColumns"
                     :data="dataList"
                     :height="tableHeight"
-                    :max-height="tableMaxHeight"
+                    :max-height="tableMaxHeight + 100"
                     :loading="loading"
                     :sort-config="{ remote: true, trigger: 'cell' }"
                     :valid-config="{

package/src/components/masterplate/RewriteBillListDetails/BillListPanelTable.vue

@@ -18,13 +18,14 @@
                 <!-- 表格覆写点开始 -->
                 <vxe-grid
                     ref="table"
-                    border="inner"
+                    border="full"
                     :columns="RewriteColumns"
                     :data="RewriteData"
                     :height="tableHeight"
                     :max-height="tableMaxHeight"
                     :loading="loading"
                     :sort-config="{ remote: true, trigger: 'cell' }"
+                    :seq-config="seqConfig"
                     @sort-change="RewriteTableOnSortChange"
                     @cell-dblclick="RewriteTableCellDBlclick"
                 >
@@ -32,45 +33,6 @@
                         <Spin size="large" style="display: inline-block"></Spin>
                     </template>
                 </vxe-grid>
-                <!-- <Table
-                    ref="table"
-                    :class="isFlag"
-                    :row-class-name="myConfig.rowClassName"
-                    :loading="loading"
-                    :show-summary="myConfig.showSummary"
-                    :summary-method="handleSummary"
-                    :size="myConfig.tableSize"
-                    :stripe="myConfig.showStripe"
-                    :border="myConfig.showBorder"
-                    :height="tableHeight"
-                    :max-height="tableMaxHeight"
-                    :show-header="myConfig.showHeader"
-                    :columns="tableColumns"
-                    :data="tempData"
-                    @on-sort-change="sortChagne"
-                    @on-current-change="onCurrentChange"
-                    :highlight-row="myConfig.highLightRow"
-                    @on-row-dblclick="dbclick"
-                    @on-select="onSelect"
-                    @on-select-cancel="onSelectCancel"
-                    @on-selection-change="OnSelectionChange"
-                    @on-row-click="click"
-                    @on-column-width-resize="onColumnWidthResize"
-                >
-                    <template
-                        v-for="config in soltTableColumns"
-                        v-slot:[config.key]="{ row, index }"
-                        :key="'show_' + config.key"
-                    >
-                        <ShowText
-                            :label="formatValue(index, config, row)"
-                            :contentAlign="config.contentAlign"
-                            :class="config.cellClassName"
-                            :config="config"
-                            :rowIndex="index"
-                        ></ShowText>
-                    </template>
-                </Table> -->
                 <!-- 表格覆写点结束 -->
             </Card>
             <div ref="page" name="page">
@@ -329,6 +291,17 @@ export default {
                 };
             });
         },
+
+        /**
+         * 表格分页行号起始值
+         */
+        seqConfig() {
+            return {
+                startIndex:
+                    (this.myConfig.pageConfig.page_no - 1) *
+                    this.myConfig.pageConfig.page_size,
+            };
+        },
     },
     methods: {
         /**

package/src/plugins/theme/theme-variable.css

@@ -78,8 +78,37 @@ html:root {
     --vxe-font-size-small: 13px;
     /* 加载中 */
     --vxe-loading-color: var(--amp-primary-color);
+    --vxe-table-header-font-color: #303133;
+    --vxe-table-header-font-weight: bold;
+    --vxe-table-cell-padding-left: 8px;
+    --vxe-table-cell-padding-right: 8px;
+    --vxe-font-color: #303133;
 }
 
-.efu-stable-footer-row{
+.efu-stable-footer-row {
     background-color: rgb(245, 247, 250);
 }
+
+.vxe-table--render-default .vxe-table--border-line {
+    border: 0;
+}
+
+/* .col--valid-error .ivu-input {
+    border-color: var(--amp-error-color);
+} */
+
+.col--valid-error > .vxe-cell .ivu-input-wrapper .ivu-input,
+.col--valid-error > .vxe-cell .ivu-auto-complete .ivu-input,
+.col--valid-error > .vxe-cell .ivu-input-number,
+.col--valid-error > .vxe-cell .ivu-select .ivu-select-selection,
+.col--valid-error > .vxe-cell .ivu-cascader .ivu-input,
+.col--valid-error > .vxe-cell .ivu-date-picker .ivu-input,
+.col--valid-error > .vxe-tree-cell .ivu-input-wrapper .ivu-input,
+.col--valid-error > .vxe-tree-cell .ivu-auto-complete .ivu-input,
+.col--valid-error > .vxe-tree-cell .ivu-input-number,
+.col--valid-error > .vxe-tree-cell .ivu-select .ivu-select-selection,
+.col--valid-error > .vxe-tree-cell .ivu-cascader .ivu-input,
+.col--valid-error > .vxe-tree-cell .ivu-date-picker .ivu-input {
+    border-color: var(--amp-error-color);
+    box-shadow: none;
+}

package/src/plugins/vxeTable/index.js

@@ -1,6 +1,6 @@
-import VXETable from 'vxe-table'
-import 'vxe-table/lib/style.css'
-import '../theme/theme-variable.css'
+import VXETable from "vxe-table";
+import "vxe-table/lib/style.css";
+import "../theme/theme-variable.css";
 
 // ========== 全局renderer引入位置 ==========
 // import './renderer/filter'
@@ -10,7 +10,7 @@ import '../theme/theme-variable.css'
 
 // 全局配置
 VXETable.setup({
-    size: 'mini', // 全局尺寸
+    size: "mini", // 全局尺寸
     zIndex: 8000, // 全局 zIndex 起始值，如果项目的的 z-index 样式值过大时就需要跟随设置更大，避免被遮挡
     version: 0, // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据
     // loadingText: '加载中...', // 全局loading提示内容，如果为null则不显示文本
@@ -28,91 +28,94 @@ VXETable.setup({
         round: false,
         // emptyText: '暂无数据',
         rowConfig: {
-            keyField: '_X_ROW_KEY', // 行数据的唯一主键字段名
+            keyField: "_X_ROW_KEY", // 行数据的唯一主键字段名
             isCurrent: true, // 当鼠标点击行时，是否要高亮当前行
-            isHover: true //当鼠标移到行时，是否要高亮当前行
+            isHover: true, //当鼠标移到行时，是否要高亮当前行
         },
         radioConfig: {
-            trigger: 'default'
+            trigger: "default",
         },
         checkboxConfig: {
             strict: false,
             highlight: false,
             range: false,
-            trigger: 'default'
+            trigger: "default",
         },
         sortConfig: {
             remote: false,
-            trigger: 'default',
-            orders: ['asc', 'desc', null],
-            sortMethod: null
+            trigger: "default",
+            orders: ["asc", "desc", null],
+            sortMethod: null,
         },
         filterConfig: {
             remote: false,
-            filterMethod: null
+            filterMethod: null,
         },
         expandConfig: {
-            trigger: 'default',
-            showIcon: true
+            trigger: "default",
+            showIcon: true,
         },
         treeConfig: {
-            rowField: 'id',
-            parentField: 'parentId',
-            children: 'children',
-            hasChild: 'hasChild',
-            mapChildren: '_X_ROW_CHILD',
+            rowField: "id",
+            parentField: "parentId",
+            children: "children",
+            hasChild: "hasChild",
+            mapChildren: "_X_ROW_CHILD",
             indent: 20,
-            showIcon: true
+            showIcon: true,
         },
         tooltipConfig: {
-            enterable: true
+            enterable: true,
         },
         menuConfig: {
-            visibleMethod() {}
+            visibleMethod() {},
         },
         editConfig: {
-            mode: 'cell',
-            showAsterisk: true
+            mode: "cell",
+            showAsterisk: true,
         },
         importConfig: {
-            modes: ['insert', 'covering']
+            modes: ["insert", "covering"],
         },
         exportConfig: {
-            modes: ['current', 'selected']
+            modes: ["current", "selected"],
         },
         customConfig: {
-            storage: false
+            storage: false,
         },
         scrollX: {
-            gt: 60
+            gt: 60,
         },
         scrollY: {
             enabled: true,
-            gt: 100
+            gt: 60,
         },
         loading: {
-            icon: 'vxe-icon-spinner roll',
+            icon: "vxe-icon-spinner roll",
             // text: '加载中...'
-        }
+        },
+        mouseConfig: {
+            selected: true,
+        },
     },
     grid: {
         size: null,
         zoomConfig: {
-            escRestore: true
+            escRestore: true,
         },
         pagerConfig: {
-            perfect: false
+            perfect: false,
         },
         toolbarConfig: {
-            perfect: false
+            perfect: false,
         },
         proxyConfig: {
             autoLoad: true,
             message: true,
             props: {
                 list: null, // 用于列表，读取响应数据
-                result: 'result', // 用于分页，读取响应数据
-                total: 'page.total' // 用于分页，读取总条数
+                result: "result", // 用于分页，读取响应数据
+                total: "page.total", // 用于分页，读取总条数
             },
             beforeItem: null,
             beforeColumn: null,
@@ -121,8 +124,8 @@ VXETable.setup({
             beforeDelete: null,
             afterDelete: null,
             beforeSave: null,
-            afterSave: null
-        }
+            afterSave: null,
+        },
     },
     pager: {
         size: null,
@@ -134,79 +137,79 @@ VXETable.setup({
         pagerCount: 7,
         pageSizes: [50, 100, 200, 500],
         layouts: [
-            'Sizes',
-            'PrevJump',
-            'PrevPage',
-            'Number',
-            'NextPage',
-            'NextJump',
-            'FullJump',
-            'Total'
-        ]
+            "Sizes",
+            "PrevJump",
+            "PrevPage",
+            "Number",
+            "NextPage",
+            "NextJump",
+            "FullJump",
+            "Total",
+        ],
     },
     form: {
         preventSubmit: false,
         size: null,
         colon: false,
         validConfig: {
-            autoPos: true
+            autoPos: true,
         },
         tooltipConfig: {
-            enterable: true
+            enterable: true,
         },
-        titleAsterisk: true
+        titleAsterisk: true,
     },
     input: {
         size: null,
         transfer: false,
-        parseFormat: 'yyyy-MM-dd HH:mm:ss.SSS',
-        labelFormat: '',
-        valueFormat: '',
+        parseFormat: "yyyy-MM-dd HH:mm:ss.SSS",
+        labelFormat: "",
+        valueFormat: "",
         startDay: 1,
         digits: 2,
-        controls: true
+        controls: true,
     },
     textarea: {
         size: null,
         autosize: {
             minRows: 1,
-            maxRows: 10
-        }
+            maxRows: 10,
+        },
     },
     select: {
         size: null,
         transfer: false,
         optionConfig: {
-            keyField: '_X_OPTION_KEY' // 选项数据的唯一主键字段名
+            keyField: "_X_OPTION_KEY", // 选项数据的唯一主键字段名
         },
-        multiCharOverflow: 8
+        multiCharOverflow: 8,
     },
     toolbar: {
         size: null,
         import: {
-            mode: 'covering'
+            mode: "covering",
         },
         export: {
-            types: ['csv', 'html', 'xml', 'txt']
+            types: ["csv", "html", "xml", "txt"],
         },
         custom: {
-            showFooter: true
+            showFooter: true,
         },
         buttons: [],
-        tools: []
+        tools: [],
     },
     button: {
         size: null,
-        transfer: false
+        transfer: false,
     },
     radio: {
-        size: null
+        size: null,
     },
     checkbox: {
-        size: null
+        size: null,
     },
     switch: {
-        size: null
+        size: null,
     },
     modal: {
         // size: null,
@@ -218,21 +221,21 @@ VXETable.setup({
         marginSize: 0,
         dblclickZoom: true,
         showTitleOverflow: true,
-        storage: false
+        storage: false,
     },
     list: {
         scrollY: {
-            gt: 100
-        }
-    }
-})
+            gt: 100,
+        },
+    },
+});
 
 const install = (app, i18n) => {
     VXETable.setup({
         // 对组件内置的提示语进行国际化翻译
         // i18n: (key, args) => i18n.global.t(key, args)
-    })
-    app.use(VXETable)
-}
+    });
+    app.use(VXETable);
+};
 
-export default { install }
+export default { install };