cloud-web-corejs 1.0.54-dev.664 → 1.0.54-dev.665

package/package.json

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

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -615,7 +615,7 @@
               <el-option value="#ea5353" label="红"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label-width="0">
+          <el-form-item label-width="0" class="form-item-full">
             <el-divider class="custom-divider">{{
               i18nt("designer.setting.customLabelIcon")
             }}</el-divider>
@@ -624,12 +624,19 @@
             <icon-picker v-model="rowData.labelIconClass"></icon-picker>
           </el-form-item>
           <el-form-item :label="i18nt('designer.setting.labelIconPosition')">
-            <el-select v-model="rowData.labelIconPosition" clearable>
-              <el-option label="front" value="front"></el-option>
-              <el-option label="rear" value="rear"></el-option>
+            <el-select
+              v-model="rowData.labelIconPosition"
+              clearable
+              placeholder="默认后面"
+            >
+              <el-option label="前面" value="front"></el-option>
+              <el-option label="后面" value="rear"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item :label="i18nt('designer.setting.labelTooltip')">
+          <el-form-item
+            :label="i18nt('designer.setting.labelTooltip')"
+            class="form-item-full"
+          >
             <el-input
               type="text"
               v-model="rowData.labelTooltip"
@@ -1316,7 +1323,7 @@ export default {
         rowEditShow: null,
         utcTransformEnabled: false,
         labelIconClass: null,
-        labelIconPosition: "front",
+        labelIconPosition: "rear",
         labelTooltip: null,
         // treeNode: false,
       };
@@ -1975,5 +1982,23 @@ export default {
 .table-column-row-edit-cont {
   padding-bottom: 8px;
   box-sizing: border-box;
+
+  ::v-deep .form-m2 {
+    height: auto;
+    overflow: visible;
+
+    .form-item-full {
+      width: calc(100% - 20px) !important;
+      display: block;
+    }
+
+    .form-item-full .el-input {
+      width: 100% !important;
+    }
+  }
+
+  ::v-deep .custom-divider.el-divider--horizontal {
+    margin: 10px 0;
+  }
 }
 </style>

package/src/components/xform/form-designer/setting-panel/property-editor/labelIconPosition-editor.vue

@@ -26,8 +26,8 @@ export default {
   data() {
     return {
       labelIconPosition: [
-        { label: "front", value: "front" },
-        { label: "rear", value: "rear" },
+        { label: "前面", value: "front" },
+        { label: "后面", value: "rear" },
       ],
     };
   },

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

@@ -952,25 +952,6 @@ modules = {
         newColumns.push(col);
       });
 
-      /* let tableConfig = this.tableConfig;
-      let flag = tableConfig?.config?.toolbarConfig?.custom !== false;
-      if (
-        baseRefUtil.tableConfig &&
-        baseRefUtil.tableConfig.className === "list-table" &&
-        flag
-      ) {
-        if (tableColumns.length) {
-          let tableColumn = tableColumns[tableColumns.length - 1];
-          if (tableColumn.fixed !== "right") {
-            newColumns.push({
-              width: 47,
-              title: "",
-              fixed: "right",
-              sortable: false,
-            });
-          }
-        }
-      } */
       this.rowWidgetList = rowWidgetList;
       return this.$baseLodash.cloneDeep(newColumns);
     },
@@ -1277,9 +1258,6 @@ modules = {
             let editWidget = item.editWidget;
             if (editWidget && editWidget.options.required) {
               let formField = this.getFieldKeyName(editWidget);
-              /* editRules[formField] = [
-                { required: true, message: `[${editWidget.options.label}]不能为空` }
-              ]; */
             }
           }
         });

package/src/components/xform/utils/tableColumnHelper.js

@@ -49,7 +49,7 @@ export function applyColumnLabelIcon(col, columnConfig) {
   }
 
   const iconClass = columnConfig.labelIconClass;
-  const position = columnConfig.labelIconPosition || "front";
+  const position = columnConfig.labelIconPosition || "rear";
   const tooltip = columnConfig.labelTooltip;
   const required = !!columnConfig.required;
   const title = col.title;