cloud-web-corejs 1.0.54-dev.634 → 1.0.54-dev.636

package/package.json

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

package/src/components/table/index copy.js

@@ -296,7 +296,6 @@ function columnDrop(t, tableName, tableRef) {
         let oldColumn = tableColumn.find((item) => item.id === draggedColId);
         let newColumn = tableColumn.find((item) => item.id === relatedColId);
         if (!oldColumn || !newColumn) {
-          debugger;
           return;
         }
 
@@ -310,7 +309,6 @@ function columnDrop(t, tableName, tableRef) {
         const oldLeafColumn = fullColumn[oldColumnIndex];
         const newLeafColumn = fullColumn[newColumnIndex];
         if (!oldLeafColumn || !newLeafColumn) {
-          debugger;
           return;
         }
 

package/src/components/table/index.js

@@ -50,10 +50,10 @@ function collectTopRootIndex(collectColumn, leaf) {
 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;
   }
@@ -171,8 +171,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) {
@@ -195,17 +195,17 @@ function handleToolbar($grid, option) {
 function handleCustomAlign(option) {
   let selfConfig = getSelfConfig();
   // let customAlign = option.customAlign || selfConfig.customAlign || "right";
-  let customAlign
-    = selfConfig.customAlign === false
+  let customAlign =
+    selfConfig.customAlign === false
       ? false
       : selfConfig.customAlign || "right";
-  customAlign
-    = option.customAlign === false ? false : option.customAlign || customAlign;
+  customAlign =
+    option.customAlign === false ? false : option.customAlign || customAlign;
 
-  let customColumnWidth
-    = option.customColumnWidth || selfConfig.customColumnWidth || 47;
-  let checkBoxColumnWidth
-    = option.checkBoxColumnWidth || selfConfig.checkBoxColumnWidth || 48;
+  let customColumnWidth =
+    option.customColumnWidth || selfConfig.customColumnWidth || 47;
+  let checkBoxColumnWidth =
+    option.checkBoxColumnWidth || selfConfig.checkBoxColumnWidth || 48;
 
   let checkBoxRequired = selfConfig.checkBoxRequired !== false;
   if (option.checkBoxRequired === false) {
@@ -300,15 +300,17 @@ function columnDrop(t, tableName, tableRef) {
         let { item } = dropParam;
         let oldIndex = dragStartIndex;
         let newIndex = dragEndIndex;
-        if(newIndex < 0) newIndex = dropParam.newIndex;
-        const { fullColumn, tableColumn, collectColumn }
-          = $table.getTableColumn();
+
+        if (newIndex < 0) newIndex = dropParam.newIndex;
+        const { fullColumn, tableColumn, collectColumn } =
+          $table.getTableColumn();
         const targetThElem = item;
         const wrapperElem = targetThElem.parentNode;
         let oldColumn = tableColumn[oldIndex];
         let oldTitle = oldColumn.title;
 
         const newColumn = tableColumn[newIndex];
+        if (!newColumn) return;
         let newTitle = newColumn.title;
         if (newColumn.fixed) {
           // 错误的移动
@@ -372,25 +374,25 @@ function getSelfConfig() {
 function initColumnDefaulAttrs(columns, opts) {
   let tableConfig = configUtil.tableConfig || {};
   let selfConfig = getSelfConfig();
-  let lockCheckboxWidth
-    = opts.lockCheckboxWidth !== false
+  let lockCheckboxWidth =
+    opts.lockCheckboxWidth !== false
       ? opts.lockCheckboxWidth || selfConfig.lockCheckboxWidth
       : null;
-  let filterType
-    = opts.filterType !== false && !opts.treeNodeUrl
+  let filterType =
+    opts.filterType !== false && !opts.treeNodeUrl
       ? opts.filterType || selfConfig.filterType || "filterContent"
       : null;
-  let sortAll
-    = opts.sortAll === true || (opts.sortAll !== false && !opts.treeNodeUrl);
+  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)
+        sortAll &&
+        column.title &&
+        (column.sortable === null || column.sortable === undefined)
       ) {
         column.sortable = true;
       }
@@ -398,9 +400,9 @@ function initColumnDefaulAttrs(columns, opts) {
       // 设置过滤器
       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 = [
@@ -415,9 +417,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 = [
@@ -566,8 +568,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);
@@ -617,12 +619,12 @@ 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
@@ -649,10 +651,10 @@ function initOption(opts) {
                           .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) {
@@ -661,8 +663,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 (
@@ -818,8 +820,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;
@@ -840,8 +842,8 @@ 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;
@@ -942,8 +944,8 @@ function initColumn(option, syncColumns) {
       if (!oldColumn) return;
       matchedOld.add(oldColumn);
       if (!oldColumn.params) oldColumn.params = {};
-      const visibleSync
-        = option.visibleSync !== false && oldColumn.visibleSync !== false;
+      const visibleSync =
+        option.visibleSync !== false && oldColumn.visibleSync !== false;
       if (visibleSync) {
         oldColumn.visible = syncColumn.visible;
       }
@@ -967,9 +969,9 @@ function initColumn(option, syncColumns) {
             return syncCol.field === newColumn.field;
           });
           if (
-            syncParentColumn
-            && syncParentColumn.children
-            && syncParentColumn.children.length > 0
+            syncParentColumn &&
+            syncParentColumn.children &&
+            syncParentColumn.children.length > 0
           ) {
             // 递归处理 children
             newColumn.children = initColumn(
@@ -1104,8 +1106,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);
@@ -1127,8 +1129,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);

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -715,7 +715,7 @@ modules = {
         }
         if (t.children && t.children.length) {
           col.align = "center";
-          delete col.field;
+          // delete col.field;
           let childColumns = t.children.map((child) => {
             return createColumn(child, true);
           });

package/src/components/xform/form-render/container-item/table2-item.vue

@@ -100,6 +100,7 @@ export default {
         2: "date",
         3: "number",
         4: "text",
+        5: "select",
       },
     };
   },
@@ -150,6 +151,20 @@ export default {
           options.label = item.f_field_name;
           options.required = item.f_is_required;
           tableCell.widgetList.push(widget);
+
+          if (type === "select") {
+            if (item.f_enum_values) {
+              let enumValues = item.f_enum_values
+                .split(",")
+                .filter((value) => !!value);
+              options.optionItems = enumValues.map((value) => ({
+                label: value,
+                value: value,
+              }));
+            } else {
+              options.optionItems = [];
+            }
+          }
         }
 
         if (index === -1) {
@@ -281,9 +296,10 @@ export default {
         {
           f_field_name: "姓名", //显示名称
           f_key: "name", //字段名
-          f_field_type: 4, //类型，0: "文本输入框",1: "多行输入框",2: "日期输入框",3: "数字输入框",4:"纯文本"
+          f_field_type: 4, //类型，0: "文本输入框",1: "多行输入框",2: "日期输入框",3: "数字输入框",4:"纯文本",5: "下拉框"
           f_is_required: false, //是否必填
           f_field_value: "张三", //字段值
+          f_enum_values: "张三,李四,王五", //下拉框选项
         },
       ];
       let a = 1;