cloud-web-corejs 1.0.204 → 1.0.206

package/package.json

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

package/src/components/table/index.js

@@ -17,7 +17,7 @@ let configUtil = {
 };
 
 function getGrid(that, tableRef) {
-  var $grid;
+  let $grid;
   if (Array.isArray(that.$refs[tableRef])) {
     $grid = that.$refs[tableRef][0];
   } else {
@@ -36,11 +36,11 @@ async function initVxeTable(option) {
   ) {
     return false;
   }
-  var that = option.vue;
+  let that = option.vue;
   if (!that.$refs[option.tableRef]) {
     await that.$nextTick();
   }
-  var $grid = getGrid(that, option.tableRef);
+  let $grid = getGrid(that, option.tableRef);
   if (!$grid) {
     return false;
   }
@@ -53,8 +53,8 @@ async function initVxeTable(option) {
   $grid.originOption.vue = that;
   option.vue = that;
 
-  var isQueryAllPage = true;
-  if (option.isQueryAllPage != null) {
+  let isQueryAllPage = true;
+  if (option.isQueryAllPage !== null  && option.isQueryAllPage  !== undefined) {
     isQueryAllPage = option.isQueryAllPage;
   }
 
@@ -63,8 +63,8 @@ async function initVxeTable(option) {
     if (option.path) {
       await getTableData(that, option.tableRef, "isQueryAllPage", (res1) => {
         let result = res1.objx ? res1.objx.data : null;
-        if (result != null) {
-          if (result === "false" || result == false) {
+        if (result !== null  && result  !== undefined) {
+          if (result === "false" || result === false) {
             isQueryAllPage = false;
           } else {
             isQueryAllPage = true;
@@ -73,8 +73,8 @@ async function initVxeTable(option) {
       });
     }
     await getTableJson(tableName, that, (resultMsg) => {
-      var objx = resultMsg.objx;
-      if (objx != null) {
+      let objx = resultMsg.objx;
+      if (objx !== null  && objx  !== undefined) {
         let jsonStr = objx.data;
         if (jsonStr) {
           let json = JSON.parse(decodeURIComponent(jsonStr));
@@ -93,6 +93,7 @@ async function initVxeTable(option) {
   } else {
     $grid.searchColumns = initSearchColumns(option);
   }
+
   if(!!$grid?.$refs?.xTable){
     $grid.$refs.xTable.getCellValue = getCellValue;
     $grid.$refs.xTable.createParams = createParams;
@@ -130,7 +131,7 @@ function handleToolbar($grid, option) {
     let loopDo = function (children) {
       if (children && children.length) {
         children.forEach((item) => {
-          if (item.$options.name == "VxeToolbar") {
+          if (item.$options.name === "VxeToolbar") {
             $grid.connect(item);
           } else {
             loopDo(item.$children);
@@ -169,7 +170,7 @@ function handleCustomAlign(option) {
   if (columnSize > 0) {
     if (checkBoxRequired) {
       let firstColumn = option.columns[0];
-      if (firstColumn.type != "checkbox") {
+      if (firstColumn.type !== "checkbox") {
         option.columns.splice(0, 0, {
           type: "checkbox",
           width: checkBoxColumnWidth,
@@ -180,8 +181,8 @@ function handleCustomAlign(option) {
     }
     if (customAlign !== false) {
       let lastColumn = option.columns[columnSize - 1];
-      if (customAlign == "left") {
-        if (!lastColumn.field && lastColumn.fixed == "right") {
+      if (customAlign === "left") {
+        if (!lastColumn.field && lastColumn.fixed === "right") {
           option.columns.splice(columnSize - 1, 1);
           lastColumn.fixed = "left";
           option.columns.splice(1, 0, lastColumn);
@@ -195,13 +196,13 @@ function handleCustomAlign(option) {
             });
           }
         }
-      } else if (customAlign == "right") {
+      } else if (customAlign === "right") {
         let column1 = option.columns[1];
-        if (!column1.field && column1.fixed == "left") {
+        if (!column1.field && column1.fixed === "left") {
           option.columns.splice(1, 1);
           column1.fixed = "right";
           option.columns.push(column1);
-        } else if (lastColumn.field || lastColumn.fixed != "right") {
+        } else if (lastColumn.field || lastColumn.fixed !== "right") {
           option.columns.push({
             width: customColumnWidth,
             fixed: "right",
@@ -216,7 +217,7 @@ function handleCustomAlign(option) {
 
 //列位置拖拽
 function columnDrop(t, tableName, tableRef) {
-  var that = t;
+  let that = t;
   const $table = getGrid(that, tableRef);
   if (!$table) {
     return;
@@ -275,9 +276,9 @@ function getSelfConfig() {
 }
 
 function initColumnDefaulAttrs(columns, opts) {
-  if (opts.sortAll == true || (opts.sortAll !== false && !opts.treeNodeUrl)) {
+  if (opts.sortAll === true || (opts.sortAll !== false && !opts.treeNodeUrl)) {
     for (let i = 0; i < columns.length; i++) {
-      if (columns[i].title && columns[i].sortable == null) {
+      if (columns[i].title && columns[i].sortable === null || columns[i].sortable === undefined) {
         columns[i].sortable = true;
       }
     }
@@ -292,8 +293,8 @@ function initColumnDefaulAttrs(columns, opts) {
       columns.forEach((column) => {
         if (column.title && column.field) {
           if (
-            column.filterType == "filterContent"
-            || (column.filterType == null && filterType == "filterContent")
+            column.filterType === "filterContent"
+            || ((column.filterType === null || column.filterType === undefined) && filterType === "filterContent")
           ) {
             if (!column.filters) {
               column.filters = [
@@ -309,7 +310,7 @@ function initColumnDefaulAttrs(columns, opts) {
             }
           } else if (
             column.filterType === "filterInput"
-            || (column.filterType == null && filterType == "filterInput")
+            || ((column.filterType === null || column.filterType === undefined) && filterType === "filterInput")
           ) {
             if (!column.filters) {
               column.filters = [
@@ -335,7 +336,7 @@ function initColumnDefaulAttrs(columns, opts) {
       = opts.lockCheckboxWidth || selfConfig.lockCheckboxWidth;
     if (lockCheckboxWidth) {
       columns.forEach((column) => {
-        if (column.type == "checkbox") {
+        if (column.type === "checkbox") {
           column.width = lockCheckboxWidth;
         }
       });
@@ -345,83 +346,18 @@ function initColumnDefaulAttrs(columns, opts) {
 
 function initOption(opts) {
   let result = {};
-  var that = opts.vue;
-  var $grid = getGrid(that, opts.tableRef);
+  let that = opts.vue;
+  let $grid = getGrid(that, opts.tableRef);
 
   let path = opts.path || "";
   // let columns = JSON.parse(JSON.stringify(opts.columns || []));
   let columns = opts.columns || [];
   let isQueryAllPage = opts.isQueryAllPage;
-  var pagerLayouts = getPagerConfigLayouts(opts);
+  let pagerLayouts = getPagerConfigLayouts(opts);
 
   let config = opts.config || {};
 
   initColumnDefaulAttrs(columns, opts);
-  /*if (opts.sortAll == true || (opts.sortAll !== false && !opts.treeNodeUrl)) {
-    for (let i = 0; i < columns.length; i++) {
-      if (columns[i].title && columns[i].sortable == null) {
-        columns[i].sortable = true;
-      }
-    }
-  }
-
-  let tableConfig = configUtil.tableConfig || {};
-  let selfConfig = getSelfConfig();
-  if (opts.filterType !== false && !opts.treeNodeUrl) {
-    let filterType
-      = opts.filterType || selfConfig.filterType || "filterContent";
-    if (filterType) {
-      columns.forEach((column) => {
-        if (column.title && column.field) {
-          if (
-            column.filterType == "filterContent"
-            || (column.filterType == null && filterType == "filterContent")
-          ) {
-            if (!column.filters) {
-              column.filters = [
-                {
-                  data: {},
-                },
-              ];
-            }
-            if (!column.filterRender) {
-              column.filterRender = {
-                name: "FilterContent",
-              };
-            }
-          } else if (
-            column.filterType === "filterInput"
-            || (column.filterType == null && filterType == "filterInput")
-          ) {
-            if (!column.filters) {
-              column.filters = [
-                {
-                  data: "",
-                },
-              ];
-            }
-            if (!column.filterRender) {
-              column.filterRender = {
-                name: "FilterInput",
-              };
-            }
-          }
-        }
-      });
-    }
-  }
-
-  //设置复选框列的锁定宽度
-  if (opts.lockCheckboxWidth !== false) {
-    let lockCheckboxWidth = opts.lockCheckboxWidth || selfConfig.lockCheckboxWidth;
-    if (lockCheckboxWidth) {
-      columns.forEach((column) => {
-        if (column.type == 'checkbox') {
-          column.width = lockCheckboxWidth;
-        }
-      });
-    }
-  }*/
 
   let defaultOptions = {
     columnKey: true,
@@ -450,7 +386,7 @@ function initOption(opts) {
       layouts: pagerLayouts,
       slots: {
         left: (obj, b, c) => {
-          var $grid = obj.$grid;
+          let $grid = obj.$grid;
           let k = $grid.$data;
           let tableDataInfo = $grid.getTableData();
           let data = tableDataInfo.fullData;
@@ -568,14 +504,14 @@ function initOption(opts) {
                 queryParams["current"] = page.currentPage;
               }
 
-              var $grid = getGrid(that, opts.tableRef);
+              let $grid = getGrid(that, opts.tableRef);
               let isQueryAllPage = $grid.isQueryAllPage;
               let pathStr1 = "";
               if (isQueryAllPage === false) {
                 queryParams.searchCount = false;
               }
 
-              var reqPath = typeof path == "function" ? path() : path;
+              let reqPath = typeof path === "function" ? path() : path;
               let addUserForTableEnabled
                 = settingConfig.addUserForTableDisabled !== true;
               let addCreateInfo
@@ -591,21 +527,21 @@ function initOption(opts) {
                 queryCreateInfo: queryCreateInfo,
                 callback: (res) => {
                   resolve(res);
-                  if (res.type == "success") {
+                  if (res.type === "success") {
                     let rows = res.objx
                       ? res.objx.records || res.objx || []
                       : [];
                     if (opts.treeNodeUrl) {
                       if (rows.length > 0) {
                         let $t = getGrid(that, opts.tableRef);
-                        var treeConditions = $t.originOption.treeConditions || [
+                        let treeConditions = $t.originOption.treeConditions || [
                           "enabled",
                         ];
                         let treeFiled = Object.keys(formData).some((key) => {
                           return (
                             !treeConditions.includes(key)
-                            && formData[key] != null
-                            && formData[key] != ""
+                            && formData[key] !== null && formData[key] !== undefined
+                            && formData[key] !== ""
                           );
                         });
                         if (treeFiled) {
@@ -621,7 +557,7 @@ function initOption(opts) {
                                   if (
                                     $t.$refs.xTable.isTreeExpandByRow(lineData)
                                   ) {
-                                    var rest = fullAllDataRowMap.get(lineData);
+                                    let rest = fullAllDataRowMap.get(lineData);
                                     rest.treeLoaded = true;
                                   }
                                 });
@@ -644,7 +580,7 @@ function initOption(opts) {
                     if (opts.callback) {
                       that.$nextTick(() => {
                         setTimeout(function () {
-                          opts.callback(rows);
+                          opts.callback(rows, res);
                         }, 0);
                       });
                     }
@@ -727,7 +663,7 @@ function initOption(opts) {
             method: "post",
             data: treeNodeParam,
             callback: (res) => {
-              if (res.type == "success") {
+              if (res.type === "success") {
                 // let rows = res.objx || [];
                 let rows = res.objx ? res.objx.records || res.objx || [] : [];
                 let hasChildField = $grid.treeConfig.hasChild;
@@ -738,7 +674,7 @@ function initOption(opts) {
                 if (opts.treeCallback) {
                   that.$nextTick(() => {
                     setTimeout(function () {
-                      opts.treeCallback(rows);
+                      opts.treeCallback(rows, res);
                     }, 0);
                   });
                 }
@@ -776,11 +712,11 @@ function getTableJson(tableName, that, success) {
   )
     return false;
   if (!tableName) return;
-  var url = USER_PREFIX + "/table_column/getTableJson";
-  var data = {
+  let url = USER_PREFIX + "/table_column/getTableJson";
+  let data = {
     tableName: tableName,
   };
-  var json = null;
+  let json = null;
   return that.$http({
     url: url,
     method: "post",
@@ -825,8 +761,8 @@ function addTableJson(that, $grid, tableName, columns, success) {
   }
   let json = encodeURIComponent(JSON.stringify(jsonData));
 
-  var url = USER_PREFIX + "/table_column/addTableJson";
-  var data = {
+  let url = USER_PREFIX + "/table_column/addTableJson";
+  let data = {
     tableName: tableName,
     // json: encodeURIComponent(JSON.stringify(saveColumn)),
     json: json,
@@ -850,11 +786,15 @@ function initColumn(option, syncColumns) {
         oldColumns.some(function (oldColumn) {
           let flag = oldColumn.field === field;
           if (flag) {
-            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){
+              oldColumn.params._width = oldColumn.width;
+            }
             if (syncColumn.width) oldColumn.width = syncColumn.width;
             newColumns.push(oldColumn);
             fields.push(field);
@@ -927,9 +867,9 @@ function initSearchColumns(option, syncColumns) {
 }
 
 function onColumnWitchChange(option) {
-  var that = option.$grid.$parent;
-  var $grid = option.$grid;
-  var originOption = $grid.originOption;
+  let that = option.$grid.$parent;
+  let $grid = option.$grid;
+  let originOption = $grid.originOption;
   let tableName = originOption.tableName;
   if (tableName) {
     // let columns = $grid.columns;
@@ -941,14 +881,28 @@ function onColumnWitchChange(option) {
 function customHandle(option) {
   let that = option.$grid.$parent;
   let $grid = option.$grid;
-  var originOption = $grid.originOption;
-  if (option.type == "confirm" || option.type == "reset") {
+  let originOption = $grid.originOption;
+  if (option.type === "confirm" || option.type === "reset") {
     let tableName = originOption.tableName;
-    if (option.type == "reset") {
-      let columns = that.$baseLodash.cloneDeep(originOption.columns);
-      initColumnDefaulAttrs(columns, originOption);
-      $grid.columns = columns;
-      // $grid.columns = originOption.columns;
+    if (option.type === "reset") {
+      const {fullColumn} = $grid.getTableColumn();
+      const loopDo = (columns)=>{
+        columns.forEach((item)=>{
+          if(item.children && item.children.length){
+            loopDo(item.children);
+          }else{
+            if(item.params){
+              item.visible = item.params._visible ?? true;
+              if(item.params._width !== undefined)item.width = item.params._width;
+            }
+          }
+        })
+      }
+      loopDo(fullColumn);
+      $grid.loadColumn(fullColumn);
+      // let columns = that.$baseLodash.cloneDeep(originOption.columns);
+      // initColumnDefaulAttrs(columns, originOption);
+      // $grid.columns = columns;
     }
     if (tableName) {
       setTimeout(() => {
@@ -965,7 +919,7 @@ function customHandle(option) {
 }
 
 function changeSelectCount(checked) {
-  var checkedLength = checked.records.length;
+  let checkedLength = checked.records.length;
 }
 
 function getTableData(that, tableRef, type, success) {
@@ -974,14 +928,14 @@ function getTableData(that, tableRef, type, success) {
     || settingConfig.tableStorageDisabled
   )
     return false;
-  var $grid = getGrid(that, tableRef);
-  var tableName = $grid.tableName;
-  var url = USER_PREFIX + "/table_column/getTableData";
-  var param = {
+  let $grid = getGrid(that, tableRef);
+  let tableName = $grid.tableName;
+  let url = USER_PREFIX + "/table_column/getTableData";
+  let param = {
     tableName: tableName,
     type: type,
   };
-  var data = null;
+  let data = null;
   return that.$http({
     async: false,
     url: url,
@@ -997,8 +951,8 @@ function addTableData(that, tableRef, value, success) {
     || settingConfig.tableStorageDisabled
   )
     return false;
-  var $grid = getGrid(that, tableRef);
-  var tableName = $grid.tableName;
+  let $grid = getGrid(that, tableRef);
+  let tableName = $grid.tableName;
   if (tableName) {
     that.$http({
       method: "post",
@@ -1014,11 +968,11 @@ function addTableData(that, tableRef, value, success) {
 }
 
 function checkQueryTotal(that, tableRef, value) {
-  var $grid = getGrid(that, tableRef);
+  let $grid = getGrid(that, tableRef);
   $grid.isQueryAllPage = value;
-  var tableName = $grid.tableName;
-  var option = $grid.getProxyInfo();
-  var pagerConfig = $grid.pagerConfig;
+  let tableName = $grid.tableName;
+  let option = $grid.getProxyInfo();
+  let pagerConfig = $grid.pagerConfig;
 
   $grid.pagerConfig.layouts = pagerConfig.layouts || [];
   addTableData(that, tableRef, value);