cloud-web-corejs 1.0.54-dev.626 → 1.0.54-dev.628

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.626",
+  "version": "1.0.54-dev.628",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/baseTabs/index.vue

@@ -1,27 +1,35 @@
 <template>
   <div>
-    <div class="slide-wrap" v-if="$attrs.showNav!==false">
+    <div class="slide-wrap" v-if="$attrs.showNav !== false">
       <template v-for="(item, index) in navList">
-        <div :key="index" v-show="item.visible!==false">
-          <a href="javascript:void(0)" class="slide-nav" @click="handleChange(index)">
+        <div :key="index" v-show="item.visible !== false">
+          <a
+            href="javascript:void(0)"
+            class="slide-nav"
+            @click="handleChange(index)"
+          >
             <p>{{ item.label }}</p>
           </a>
         </div>
       </template>
     </div>
-    <div class="d-cont">
+    <div class="d-cont" :class="{ 'full-width': $attrs.showNav === false }">
       <slot></slot>
     </div>
   </div>
 </template>
 
 <script>
-import {baseTabsMixin} from './mixins.js';
+import { baseTabsMixin } from "./mixins.js";
 
 export default {
-  name: 'baseTabs',
-  mixins: [baseTabsMixin]
+  name: "baseTabs",
+  mixins: [baseTabsMixin],
 };
 </script>
 
-<style></style>
+<style>
+div.d-cont.full-width .d-item {
+  padding-right: 16px !important;
+}
+</style>

package/src/components/table/index.js

@@ -4,10 +4,10 @@ import Sortable from "sortablejs";
 import tableConfig from "./config.js";
 import customConfig from "./customConfig.js";
 import Vue from "vue";
-import {extendDeeply} from "../../utils/index.js";
+import { extendDeeply } from "../../utils/index.js";
 import corejsConfig from "@/corejsConfig";
 import settingConfig from "@/settings.js";
-import {getCellValue, createParams} from "./util/index";
+import { getCellValue, createParams } from "./util/index";
 
 let configUtil = {
   Sortable,
@@ -29,10 +29,10 @@ function getGrid(that, tableRef) {
 async function initVxeTable(option) {
   let tableName = option.tableName;
   if (
-    !configUtil.tableConfig.disableTableName
-    && option.tableNameRequired !== false
-    && !tableName
-    && settingConfig.tableStorageDisabled !== true
+    !configUtil.tableConfig.disableTableName &&
+    option.tableNameRequired !== false &&
+    !tableName &&
+    settingConfig.tableStorageDisabled !== true
   ) {
     return false;
   }
@@ -58,17 +58,17 @@ async function initVxeTable(option) {
   option.vue = that;
 
   let isQueryAllPage = true;
-  if (option.isQueryAllPage !== null  && option.isQueryAllPage  !== undefined) {
+  if (option.isQueryAllPage !== null && option.isQueryAllPage !== undefined) {
     isQueryAllPage = option.isQueryAllPage;
   }
 
-  let searchColumns = null
+  let searchColumns = null;
   if (tableName) {
     $grid.tableName = tableName;
     if (option.path) {
       await getTableData(that, option.tableRef, "isQueryAllPage", (res1) => {
         let result = res1.objx ? res1.objx.data : null;
-        if (result !== null  && result  !== undefined) {
+        if (result !== null && result !== undefined) {
           if (result === "false" || result === false) {
             isQueryAllPage = false;
           } else {
@@ -79,7 +79,7 @@ async function initVxeTable(option) {
     }
     await getTableJson(tableName, that, (resultMsg) => {
       let objx = resultMsg.objx;
-      if (objx !== null  && objx  !== undefined) {
+      if (objx !== null && objx !== undefined) {
         let jsonStr = objx.data;
         if (jsonStr) {
           let json = JSON.parse(decodeURIComponent(jsonStr));
@@ -87,7 +87,10 @@ async function initVxeTable(option) {
           if (columnData) {
             option.columns = initColumn(option, columnData);
           }
-          searchColumns = initSearchColumns(option.searchColumns, json.searchColumns);
+          searchColumns = initSearchColumns(
+            option.searchColumns,
+            json.searchColumns
+          );
           $grid.searchColumns = searchColumns;
           initExportColumns($grid, json);
         }
@@ -102,7 +105,7 @@ async function initVxeTable(option) {
     $grid.searchColumns = searchColumns;
   }
 
-  if(!!$grid?.$refs?.xTable){
+  if (!!$grid?.$refs?.xTable) {
     $grid.$refs.xTable.getCellValue = getCellValue;
     $grid.$refs.xTable.createParams = createParams;
   }
@@ -138,7 +141,7 @@ async function initVxeTable(option) {
     isQueryAllPage,
     searchColumns,
   };
-  if(!nOption.params)nOption.params = {};
+  if (!nOption.params) nOption.params = {};
   Object.assign(nOption.params, params);
   return nOption;
 }
@@ -147,8 +150,8 @@ async function initVxeTable(option) {
 function handleToolbar($grid, option) {
   let selfConfig = getSelfConfig();
   if (
-    option.bindToolbar
-    || (option.bindToolbar !== false && selfConfig.bindToolbar)
+    option.bindToolbar ||
+    (option.bindToolbar !== false && selfConfig.bindToolbar)
   ) {
     let loopDo = function (children) {
       if (children && children.length) {
@@ -171,17 +174,17 @@ function handleToolbar($grid, option) {
 function handleCustomAlign(option) {
   let selfConfig = getSelfConfig();
   // let customAlign = option.customAlign || selfConfig.customAlign || "right";
-  let customAlign
-    = selfConfig.customAlign === false
-    ? false
-    : selfConfig.customAlign || "right";
-  customAlign
-    = option.customAlign === false ? false : option.customAlign || customAlign;
-
-  let customColumnWidth
-    = option.customColumnWidth || selfConfig.customColumnWidth || 47;
-  let checkBoxColumnWidth
-    = option.checkBoxColumnWidth || selfConfig.checkBoxColumnWidth || 48;
+  let customAlign =
+    selfConfig.customAlign === false
+      ? false
+      : selfConfig.customAlign || "right";
+  customAlign =
+    option.customAlign === false ? false : option.customAlign || customAlign;
+
+  let customColumnWidth =
+    option.customColumnWidth || selfConfig.customColumnWidth || 47;
+  let checkBoxColumnWidth =
+    option.checkBoxColumnWidth || selfConfig.checkBoxColumnWidth || 48;
 
   let checkBoxRequired = selfConfig.checkBoxRequired !== false;
   if (option.checkBoxRequired === false) {
@@ -253,8 +256,9 @@ function columnDrop(t, tableName, tableRef) {
     ),
     {
       handle: ".vxe-header--column:not(.col--fixed)",
-      onEnd: ({item, newIndex, oldIndex}) => {
-        const {fullColumn, tableColumn,collectColumn} = $table.getTableColumn();
+      onEnd: ({ item, newIndex, oldIndex }) => {
+        const { fullColumn, tableColumn, collectColumn } =
+          $table.getTableColumn();
         const targetThElem = item;
         const wrapperElem = targetThElem.parentNode;
         const newColumn = tableColumn[newIndex];
@@ -303,23 +307,35 @@ function getSelfConfig() {
 function initColumnDefaulAttrs(columns, opts) {
   let tableConfig = configUtil.tableConfig || {};
   let selfConfig = getSelfConfig();
-  let lockCheckboxWidth = opts.lockCheckboxWidth !== false ? (opts.lockCheckboxWidth || selfConfig.lockCheckboxWidth) : null;
-  let filterType = opts.filterType !== false && !opts.treeNodeUrl ? (opts.filterType || selfConfig.filterType || "filterContent") : null;
-  let sortAll = opts.sortAll === true || (opts.sortAll !== false && !opts.treeNodeUrl);
+  let lockCheckboxWidth =
+    opts.lockCheckboxWidth !== false
+      ? opts.lockCheckboxWidth || selfConfig.lockCheckboxWidth
+      : null;
+  let filterType =
+    opts.filterType !== false && !opts.treeNodeUrl
+      ? opts.filterType || selfConfig.filterType || "filterContent"
+      : null;
+  let sortAll =
+    opts.sortAll === true || (opts.sortAll !== false && !opts.treeNodeUrl);
 
   columns.forEach((column) => {
     // 只有最底层的列（没有 children）才设置默认属性
     if (!column.children || column.children.length === 0) {
       // 设置 sortable
-      if (sortAll && column.title && (column.sortable === null || column.sortable === undefined)) {
+      if (
+        sortAll &&
+        column.title &&
+        (column.sortable === null || column.sortable === undefined)
+      ) {
         column.sortable = true;
       }
 
       // 设置过滤器
       if (filterType && column.title && column.field) {
         if (
-          column.filterType === "filterContent"
-          || ((column.filterType === null || column.filterType === undefined) && filterType === "filterContent")
+          column.filterType === "filterContent" ||
+          ((column.filterType === null || column.filterType === undefined) &&
+            filterType === "filterContent")
         ) {
           if (!column.filters) {
             column.filters = [
@@ -334,8 +350,9 @@ function initColumnDefaulAttrs(columns, opts) {
             };
           }
         } else if (
-          column.filterType === "filterInput"
-          || ((column.filterType === null || column.filterType === undefined) && filterType === "filterInput")
+          column.filterType === "filterInput" ||
+          ((column.filterType === null || column.filterType === undefined) &&
+            filterType === "filterInput")
         ) {
           if (!column.filters) {
             column.filters = [
@@ -484,8 +501,8 @@ function initOption(opts) {
     },*/
     columns: columns,
   };
-  let tableDefaultConfig
-    = corejsConfig?.componentConfig?.table?.defaultConfig || {};
+  let tableDefaultConfig =
+    corejsConfig?.componentConfig?.table?.defaultConfig || {};
   defaultOptions = configUtil.extendDeeply(defaultOptions, tableConfig);
   defaultOptions = configUtil.extendDeeply(defaultOptions, customConfig);
   defaultOptions = configUtil.extendDeeply(defaultOptions, tableDefaultConfig);
@@ -503,7 +520,7 @@ function initOption(opts) {
       },
       ajax: {
         // 接收 Promise 对象
-        query: ({page, sorts, filters, form}) => {
+        query: ({ page, sorts, filters, form }) => {
           if (!opts.path) {
             return;
           }
@@ -519,7 +536,7 @@ function initOption(opts) {
                 queryParams.order = firstSort.order;
               }*/
               // 处理筛选条件
-              filters.forEach(({property, values}) => {
+              filters.forEach(({ property, values }) => {
                 queryParams[property] = values.join(",");
               });
               if (page.pageSize !== undefined) {
@@ -535,17 +552,23 @@ function initOption(opts) {
               }
 
               let reqPath = typeof path === "function" ? path() : path;
-              let addUserForTableEnabled
-                = settingConfig.addUserForTableDisabled !== true;
-              let addCreateInfo
-                = opts.addCreateInfo === true || addUserForTableEnabled;
-              let queryCreateInfo
-                = opts.queryCreateInfo === true || addUserForTableEnabled;
+              let addUserForTableEnabled =
+                settingConfig.addUserForTableDisabled !== true;
+              let addCreateInfo =
+                opts.addCreateInfo === true || addUserForTableEnabled;
+              let queryCreateInfo =
+                opts.queryCreateInfo === true || addUserForTableEnabled;
+              let reqData = queryParams;
+              if (opts.paramHandle) {
+                reqData = opts.paramHandle
+                  ? opts.paramHandle(queryParams) || {}
+                  : {};
+              }
               that.$commonHttp({
                 aes: opts.aes || false,
                 url: reqPath,
                 method: "post",
-                data: queryParams,
+                data: reqData,
                 addCreateInfo: addCreateInfo,
                 queryCreateInfo: queryCreateInfo,
                 callback: (res) => {
@@ -557,14 +580,14 @@ function initOption(opts) {
                     if (opts.treeNodeUrl) {
                       if (rows.length > 0) {
                         let $t = getGrid(that, opts.tableRef);
-                        let treeConditions = $t.params.originOption.treeConditions || [
-                          "enabled",
-                        ];
+                        let treeConditions = $t.params.originOption
+                          .treeConditions || ["enabled"];
                         let treeFiled = Object.keys(formData).some((key) => {
                           return (
-                            !treeConditions.includes(key)
-                            && formData[key] !== null && formData[key] !== undefined
-                            && formData[key] !== ""
+                            !treeConditions.includes(key) &&
+                            formData[key] !== null &&
+                            formData[key] !== undefined &&
+                            formData[key] !== ""
                           );
                         });
                         if (treeFiled) {
@@ -573,8 +596,8 @@ function initOption(opts) {
                               let isLazy = $t.treeConfig.lazy;
                               $t.treeConfig.lazy = false;
                               $t.setAllTreeExpand(true).then(() => {
-                                let fullAllDataRowMap
-                                  = $t.$refs.xTable.fullAllDataRowMap;
+                                let fullAllDataRowMap =
+                                  $t.$refs.xTable.fullAllDataRowMap;
                                 let fullData = $t.getTableData().fullData;
                                 fullData.forEach((lineData) => {
                                   if (
@@ -672,14 +695,14 @@ function initOption(opts) {
       hasChild: "hasChild", // 设置是否有子节点标识
       parentField: "parent",
       transform: true,
-      loadMethod({$table, row}) {
+      loadMethod({ $table, row }) {
         // 模拟后台接口
         return new Promise((resolve, reject) => {
           let treeNodeParam = opts.treeNodeParam
             ? opts.treeNodeParam(row) || {}
             : {
-              parent: row.id,
-            };
+                parent: row.id,
+              };
           that.$http({
             aes: opts.aes || false,
             url: opts.treeNodeUrl,
@@ -730,8 +753,8 @@ function initOption(opts) {
 
 function getTableJson(tableName, that, success) {
   if (
-    configUtil.tableConfig.disableTableName
-    || settingConfig.tableStorageDisabled
+    configUtil.tableConfig.disableTableName ||
+    settingConfig.tableStorageDisabled
   )
     return false;
   if (!tableName) return;
@@ -748,13 +771,12 @@ function getTableJson(tableName, that, success) {
   });
 }
 
-function addTableExportJson() {
-}
+function addTableExportJson() {}
 
 function addTableJson(that, $grid, tableName, columns, success) {
   if (
-    configUtil.tableConfig.disableTableName
-    || settingConfig.tableStorageDisabled
+    configUtil.tableConfig.disableTableName ||
+    settingConfig.tableStorageDisabled
   )
     return false;
   if (!tableName) return;
@@ -829,7 +851,7 @@ function addTableJson(that, $grid, tableName, columns, success) {
 
 function initColumnIndex(columns) {
   columns.forEach(function (column, index) {
-    if(!column.params)column.params = {}
+    if (!column.params) column.params = {};
     if (column.params) {
       column.params._index = index;
     }
@@ -847,16 +869,20 @@ function initColumn(option, syncColumns) {
     syncColumns.forEach(function (syncColumn) {
       let field = syncColumn.field;
       if (field) {
-        oldColumns.some(function (oldColumn,index) {
+        oldColumns.some(function (oldColumn, index) {
           let flag = oldColumn.field === field;
           if (flag) {
-            if(!oldColumn.params)oldColumn.params = {}
-            let visibleSync = option.visibleSync !== false && oldColumn.visibleSync !== false;
+            if (!oldColumn.params) oldColumn.params = {};
+            let visibleSync =
+              option.visibleSync !== false && oldColumn.visibleSync !== false;
             oldColumn.params._visible = oldColumn.visible ?? true;
             if (visibleSync) {
               oldColumn.visible = syncColumn.visible;
             }
-            if(oldColumn.width !== undefined && oldColumn.width !== undefined){
+            if (
+              oldColumn.width !== undefined &&
+              oldColumn.width !== undefined
+            ) {
               oldColumn.params._width = oldColumn.width;
             }
             if (syncColumn.width) oldColumn.width = syncColumn.width;
@@ -886,9 +912,16 @@ function initColumn(option, syncColumns) {
           let syncParentColumn = syncColumns.find(function (syncCol) {
             return syncCol.field === newColumn.field;
           });
-          if (syncParentColumn && syncParentColumn.children && syncParentColumn.children.length > 0) {
+          if (
+            syncParentColumn &&
+            syncParentColumn.children &&
+            syncParentColumn.children.length > 0
+          ) {
             // 递归处理 children
-            newColumn.children = initColumn({ columns: newColumn.children }, syncParentColumn.children);
+            newColumn.children = initColumn(
+              { columns: newColumn.children },
+              syncParentColumn.children
+            );
           }
         }
       });
@@ -953,7 +986,7 @@ function onColumnWitchChange(option) {
   let tableName = originOption.tableName;
   if (tableName) {
     // let columns = $grid.columns;
-    const {fullColumn, tableColumn} = $grid.getTableColumn();
+    const { fullColumn, tableColumn } = $grid.getTableColumn();
     addTableJson(that, $grid, tableName);
   }
 }
@@ -965,17 +998,17 @@ function restoreColumnPosition(currentColumns) {
     let indexB = b.params?._index ?? 0;
     return indexA - indexB;
   });
-  console.log("sortedColumns",sortedColumns);
+  console.log("sortedColumns", sortedColumns);
 
   // 递归处理 children
   sortedColumns.forEach((column) => {
     if (column.children && column.children.length > 0) {
       column.children = restoreColumnPosition(column.children);
-    }else{
+    } else {
       column.visible = column.params?._visible ?? true;
-      if(column.params?._width !== undefined){
-        column.width = column.params?._width
-      }else{
+      if (column.params?._width !== undefined) {
+        column.width = column.params?._width;
+      } else {
         // delete column.width;
       }
     }
@@ -991,7 +1024,7 @@ function customHandle(option) {
   if (option.type === "confirm" || option.type === "reset") {
     let tableName = originOption.tableName;
     if (option.type === "reset") {
-      const {collectColumn} = $grid.getTableColumn();
+      const { collectColumn } = $grid.getTableColumn();
       /* const loopDo = (columns)=>{
         columns.forEach((item)=>{
           if(item.children && item.children.length){
@@ -1010,7 +1043,7 @@ function customHandle(option) {
       let oldColumns = originOption.columns || [];
       if (oldColumns.length > 0) {
         const restoredColumns = restoreColumnPosition(collectColumn);
-        console.log("restoredColumns",restoredColumns);
+        console.log("restoredColumns", restoredColumns);
         $grid.loadColumn(restoredColumns);
       } else {
         $grid.loadColumn(collectColumn);
@@ -1038,8 +1071,8 @@ function changeSelectCount(checked) {
 
 function getTableData(that, tableRef, type, success) {
   if (
-    configUtil.tableConfig.disableTableName
-    || settingConfig.tableStorageDisabled
+    configUtil.tableConfig.disableTableName ||
+    settingConfig.tableStorageDisabled
   )
     return false;
   let $grid = getGrid(that, tableRef);
@@ -1061,8 +1094,8 @@ function getTableData(that, tableRef, type, success) {
 
 function addTableData(that, tableRef, value, success) {
   if (
-    configUtil.tableConfig.disableTableName
-    || settingConfig.tableStorageDisabled
+    configUtil.tableConfig.disableTableName ||
+    settingConfig.tableStorageDisabled
   )
     return false;
   let $grid = getGrid(that, tableRef);