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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.664",
+  "version": "1.0.54-dev.666",
   "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,
       };
@@ -1969,11 +1976,40 @@ export default {
     overflow-y: auto;
     overflow-x: hidden;
     box-sizing: border-box;
+
+    .cont.table-column-row-edit-cont {
+      overflow: visible;
+      max-height: none;
+      padding-bottom: 12px;
+    }
+
+    .form-m2 {
+      height: auto !important;
+      overflow: visible !important;
+
+      .el-form-item.form-item-full:last-child {
+        margin-bottom: 8px;
+      }
+    }
   }
 }
 
 .table-column-row-edit-cont {
-  padding-bottom: 8px;
   box-sizing: border-box;
+
+  ::v-deep .form-m2 {
+    .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-designer/setting-panel/widgetPropertyDialogMixin.js

@@ -1,4 +1,4 @@
-import { propertyRegistered } from './propertyRegister';
+import { propertyRegistered } from "./propertyRegister";
 
 let propertyDialogSeed = 0;
 
@@ -51,18 +51,24 @@ export default {
         columnEditFields: config.columnEditFields || null,
         tableColumns: config.tableColumns,
         formatConfig: config,
-        widgetActiveCollapseName1s: ['1', '3'],
+        widgetActiveCollapseName1s: ["1", "3"],
       };
       this.widgetPropertyDialogs.push(dialog);
       this.setActivePropertyDialog(id);
     },
     closeWidgetPropertyDialog(id, invokeCallback = false) {
-      const index = this.widgetPropertyDialogs.findIndex((dlg) => dlg.id === id);
+      const index = this.widgetPropertyDialogs.findIndex(
+        (dlg) => dlg.id === id
+      );
       if (index === -1) {
         return;
       }
       const dialog = this.widgetPropertyDialogs[index];
-      if (invokeCallback && dialog.formatConfig && dialog.formatConfig.callback) {
+      if (
+        invokeCallback &&
+        dialog.formatConfig &&
+        dialog.formatConfig.callback
+      ) {
         const columnSelectedWidget = this.$baseLodash.cloneDeep(
           dialog.columnSelectedWidget
         );
@@ -70,7 +76,8 @@ export default {
       }
       this.widgetPropertyDialogs.splice(index, 1);
       if (this.activePropertyDialogId === id) {
-        const last = this.widgetPropertyDialogs[this.widgetPropertyDialogs.length - 1];
+        const last =
+          this.widgetPropertyDialogs[this.widgetPropertyDialogs.length - 1];
         this.activePropertyDialogId = last ? last.id : null;
       }
       this.syncLegacyPropertyDialogState();
@@ -86,22 +93,25 @@ export default {
       if (!editorName) {
         return false;
       }
-      if (dialog.columnEditFields && !dialog.columnEditFields.includes(propName)) {
+      if (
+        dialog.columnEditFields &&
+        !dialog.columnEditFields.includes(propName)
+      ) {
         return false;
       }
       const widget = dialog.columnSelectedWidget;
-      if (propName.indexOf('-') <= -1) {
+      if (propName.indexOf("-") <= -1) {
         const originalPropName = `${widget.type}-${propName}`;
         if (propertyRegistered(originalPropName)) {
           return false;
         }
       }
-      const propKey = propName.replace(`${widget.type}-`, '');
+      const propKey = propName.replace(`${widget.type}-`, "");
       return this.designer.hasConfig(widget, propKey);
     },
     getPropEditorForDialog(dialog, propName, editorName) {
       const widget = dialog.columnSelectedWidget;
-      const propKey = propName.replace(`${widget.type}-`, '');
+      const propKey = propName.replace(`${widget.type}-`, "");
       const uniquePropName = `${widget.type}-${propKey}-editor`;
       if (this.$options.components[uniquePropName]) {
         return uniquePropName;
@@ -129,16 +139,19 @@ export default {
         ? activeDialog.columnSelectedWidget
         : this.selectedWidget;
       this.curEventName = eventName;
-      this.eventHeader = `${this.optionModel.name}.${eventName}(${eventParams.join(', ')}) {`;
+      this.eventHeader = `${
+        this.optionModel.name
+      }.${eventName}(${eventParams.join(", ")}) {`;
       if (eventOptions.customCode) {
-        this.eventHandlerCode = eventOptions.customCode() || '';
+        this.eventHandlerCode = eventOptions.customCode() || "";
       } else {
-        this.eventHandlerCode = (eventWidget && eventWidget.options[eventName]) || '';
+        this.eventHandlerCode =
+          (eventWidget && eventWidget.options[eventName]) || "";
       }
       this.eventOption = eventOptions;
-      if (eventName === 'onCreated' && !this.optionModel.onCreated) {
+      /* if (eventName === 'onCreated' && !this.optionModel.onCreated) {
         this.eventHandlerCode = '  //组件创建生命周期\n  console.log(\'test onCreated()\')\n';
-      }
+      } */
       this.showWidgetEventDialogFlag = true;
     },
     saveEventHandler() {
@@ -146,12 +159,12 @@ export default {
       let hasError = false;
       if (editorAnnotations && editorAnnotations.length > 0) {
         editorAnnotations.forEach((item) => {
-          if (item.type === 'error') {
+          if (item.type === "error") {
             hasError = true;
           }
         });
         if (hasError) {
-          this.$message.error(this.i18nt('designer.hint.syntaxCheckWarning'));
+          this.$message.error(this.i18nt("designer.hint.syntaxCheckWarning"));
           return;
         }
       }

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;