cloud-web-corejs 1.0.54-dev.536 → 1.0.54-dev.537

package/package.json

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

package/src/components/xform/form-designer/form-widget/field-widget/copy_button-widget.vue

@@ -75,8 +75,14 @@
         if(this.designState || this.field.options.disabled)return
         let copyData = this.$baseLodash.cloneDeep(this.formModel);
 
-        this.handleCustomEvent(this.field.options.copyDataHandle, ["copyData"], [copyData])
-        this.getFormRef().openCopyEditTab(copyData);
+        const done = () => {
+          this.getFormRef().openCopyEditTab(copyData);
+        }
+        let result = this.handleCustomEvent(this.field.options.copyDataHandle, ["copyData",'done'], [copyData,done])
+        if(result === false){
+          return;
+        }
+        done();
       }
     }
 

package/src/components/xform/form-designer/form-widget/field-widget/static-text-widget.vue

@@ -2,8 +2,8 @@
   <static-content-wrapper :designer="designer" :field="field" :design-state="designState"
                           :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                           :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <div ref="fieldEditor" :style="!!field.options.fontSize ? `font-size: ${field.options.fontSize};`: ''">
-      {{field.options.textContent}}</div>
+    <div ref="fieldEditor" :style="!!field.options.fontSize ? `font-size: ${field.options.fontSize};`: ''" :class="widgetClass">
+      <pre :style="{'white-space': !!field.options.preWrap ? 'pre-wrap' : 'pre', 'text-align': !!field.options.textAlign ? field.options.textAlign : 'left'}">{{field.options.textContent}}</pre></div>
   </static-content-wrapper>
 </template>
 
@@ -47,7 +47,12 @@
       StaticContentWrapper,
     },
     computed: {
-
+      widgetClass() {
+        let list = [];
+        let optionModel = this.field.options
+        if (optionModel.colorClass) list.push(optionModel.colorClass);
+        return list
+      }
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */

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

@@ -25,7 +25,7 @@
     },
     data(){
       return {
-        copyDataHandleParams: ["dataId", "formCode", "copyData"]
+        copyDataHandleParams: ["dataId", "formCode", "copyData", "done"]
       }
     },
   }

package/src/components/xform/form-designer/setting-panel/property-editor/field-static-text/preWrap-editor.vue

@@ -0,0 +1,23 @@
+<template>
+  <el-form-item :label="i18nt('designer.setting.preWrap')">
+    <el-switch v-model="optionModel.preWrap"></el-switch>
+  </el-form-item>
+</template>
+
+<script>
+  import i18n from "../../../../../../components/xform/utils/i18n"
+
+  export default {
+    name: "static-text-preWrap-editor",
+    mixins: [i18n],
+    props: {
+      designer: Object,
+      selectedWidget: Object,
+      optionModel: Object,
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/field-static-text/textContent-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.textContent')">
-    <el-input v-model="optionModel.textContent"></el-input>
+    <el-input type="textarea" :rows="3" v-model="optionModel.textContent"></el-input>
   </el-form-item>
 </template>
 

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -83,6 +83,7 @@ const COMMON_PROPERTIES = {
   'copyButton': 'copyButton-editor',
   "tempStorageFlag": "tempStorage-editor",
   'formatType': 'formatType-editor',
+  'preWrap': 'preWrap-editor',
 
   //容器
   'showBlankRow': 'showBlankRow-editor',

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -1722,6 +1722,8 @@ export const basicFields = [
       hidden: !1,
       textContent: "static text",
       fontSize: "13px",
+      preWrap: true,  //是否自动换行
+      colorClass: "",  //字体颜色
       customClass: "",
       onCreated: "",
       onMounted: "",

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

@@ -153,8 +153,8 @@ modules = {
     buttonsColumnFixed: function () {
       return void 0 === this.widget.options.buttonsColumnFixed
         ? "right"
-        : !!this.widget.options.buttonsColumnFixed &&
-            this.widget.options.buttonsColumnFixed;
+        : !!this.widget.options.buttonsColumnFixed
+            && this.widget.options.buttonsColumnFixed;
     },
     formModel: {
       cache: !1,
@@ -188,8 +188,8 @@ modules = {
   },
   methods: {
     initTableCustomEvent() {
-      let tableConfig =
-        this.handleCustomEvent(this.widget.options.tableConfig) || {};
+      let tableConfig
+        = this.handleCustomEvent(this.widget.options.tableConfig) || {};
       this.eventConfig = tableConfig.eventConfig || {};
     },
     getTableColumnStatusWidgetLabelKey(obj) {
@@ -255,8 +255,8 @@ modules = {
       if (!formScriptEnabledTypes.includes(widgetType)) return;
 
       let formScriptEnabled = widget.options.formScriptEnabled || false;
-      let commonAttributeEnabled =
-        widget.options.commonAttributeEnabled || false;
+      let commonAttributeEnabled
+        = widget.options.commonAttributeEnabled || false;
       let commonAttributeCode = widget.options.commonAttributeCode;
       if (commonAttributeEnabled) {
         if (!commonAttributeCode) return;
@@ -513,8 +513,8 @@ modules = {
       let ignoreFields = options?.ignoreFields || [];
       this.widget.widgetList.forEach((subWidget) => {
         if (
-          !ignoreFields.length ||
-          !ignoreFields.includes(subWidget.options.name)
+          !ignoreFields.length
+          || !ignoreFields.includes(subWidget.options.name)
         ) {
           let widgetRef = this.getWidgetRef(subWidget.options.name);
           if (widgetRef && widgetRef.setValue) widgetRef.setValue(null);
@@ -554,9 +554,9 @@ modules = {
         formCode = formConfig.addFormCode || formConfig.editFormCode;
       }
       let parentTarget = formRef.$attrs["parent-target"];
-      parentTarget &&
-        parentTarget.$attrs.openEditDialog &&
-        parentTarget.$attrs.openEditDialog(row, param, {
+      parentTarget
+        && parentTarget.$attrs.openEditDialog
+        && parentTarget.$attrs.openEditDialog(row, param, {
           formCode,
           ...option,
         });
@@ -738,8 +738,8 @@ modules = {
           }
         }
         if (t.tableColumnConfig) {
-          let tableColumnConfig =
-            this.handleCustomEvent(t.tableColumnConfig) || {};
+          let tableColumnConfig
+            = this.handleCustomEvent(t.tableColumnConfig) || {};
           col = extendDeeply(col, tableColumnConfig);
         }
         return col;
@@ -791,8 +791,8 @@ modules = {
 
       let isQueryAllPage = !this.widget.options.isNotQueryAllPage;
 
-      let tableConfig =
-        this.handleCustomEvent(this.widget.options.tableConfig) || {};
+      let tableConfig
+        = this.handleCustomEvent(this.widget.options.tableConfig) || {};
       this.tableConfig = tableConfig;
 
       let tableConfig2 = this.$baseLodash.cloneDeep(tableConfig);
@@ -908,12 +908,12 @@ modules = {
         .filter((column) => !!column?.params?.editWidget)
         .map((column) => column.params.editWidget);
 
-      let height =
-        this.widget.options.tableHeight || (isQueryTable ? "auto" : null);
+      let height
+        = this.widget.options.tableHeight || (isQueryTable ? "auto" : null);
       if (
-        !this.widget.options.tableHeight &&
-        isQueryTable &&
-        this.previewState
+        !this.widget.options.tableHeight
+        && isQueryTable
+        && this.previewState
       ) {
         height = "550px";
       }
@@ -1083,8 +1083,8 @@ modules = {
 
       let exportItemConfig = null;
       if (
-        this.widget.options.exportItemColumns &&
-        this.widget.options.exportItemColumns.length > 0
+        this.widget.options.exportItemColumns
+        && this.widget.options.exportItemColumns.length > 0
       ) {
         let formatKeys = [
           "d1",
@@ -1135,8 +1135,8 @@ modules = {
         );
         exportItemConfig = {
           scriptCode:
-            this.widget.options.exportItemScriptCode ||
-            this.widget.options.formScriptCode,
+            this.widget.options.exportItemScriptCode
+            || this.widget.options.formScriptCode,
           columns: exportItemColumns,
           param: () => {
             if (this.widget.options.exportItemParam) {
@@ -1298,8 +1298,8 @@ modules = {
                       if (res.type == "success") {
                         if (that.widget.options.isTreeTable) {
                           if (rows.length > 0) {
-                            let fullAllDataRowMap =
-                              $grid.$refs.xTable.fullAllDataRowMap;
+                            let fullAllDataRowMap
+                              = $grid.$refs.xTable.fullAllDataRowMap;
                             let parentField = $grid.treeConfig.parentField;
                             let expandAll = $grid.treeConfig.expandAll || false;
                             let isLazy = $grid.treeConfig.lazy;
@@ -1322,8 +1322,8 @@ modules = {
                                         lineData
                                       )
                                     ) {
-                                      let rest =
-                                        fullAllDataRowMap.get(lineData);
+                                      let rest
+                                        = fullAllDataRowMap.get(lineData);
                                       rest.treeLoaded = true;
                                     }
                                   });
@@ -1335,8 +1335,8 @@ modules = {
 
                             let row = rows.find((item) => !item[parentField]);
                             if (
-                              row &&
-                              (!expandAll || !expandIds.includes(row.id))
+                              row
+                              && (!expandAll || !expandIds.includes(row.id))
                             ) {
                               let hasChild = $grid.treeConfig.hasChild;
                               if (row[hasChild]) {
@@ -1509,13 +1509,13 @@ modules = {
                 if (["date-range", "time-range"].includes(wType)) {
                   item.filter = "between";
                 } else if (
-                  ["input-batch", "checkbox"].includes(wType) ||
-                  (wType == "select" && wItem.options.multiple)
+                  ["input-batch", "checkbox"].includes(wType)
+                  || (wType == "select" && wItem.options.multiple)
                 ) {
                   item.filter = "in";
                 } else if (
-                  ["radio", "time", "date"].includes(wType) ||
-                  (wType == "select" && !wItem.options.multiple)
+                  ["radio", "time", "date"].includes(wType)
+                  || (wType == "select" && !wItem.options.multiple)
                 ) {
                   item.filter = "eq";
                 } else {
@@ -1571,8 +1571,8 @@ modules = {
       this.loodHandleColumns(this.widget.options.tableColumns, (item) => {
         if (!item.children?.length && item.prop && item.label) {
           if (
-            item.formatS == "editSearch" &&
-            item.widget?.options?.multipleChoices
+            item.formatS == "editSearch"
+            && item.widget?.options?.multipleChoices
           ) {
             result.push(item.prop);
           }
@@ -1726,8 +1726,8 @@ modules = {
     },
     loadAccessData(flag) {
       if (
-        this.formModel[this.fieldKeyName] &&
-        this.formModel[this.fieldKeyName].length
+        this.formModel[this.fieldKeyName]
+        && this.formModel[this.fieldKeyName].length
       ) {
         this.initValue(this.formModel[this.fieldKeyName]);
       }
@@ -1796,9 +1796,9 @@ modules = {
     },
     isSingerlSearch(widget) {
       let widgetType = widget?.type;
-      let result =
-        widgetType === "singerSearch" ||
-        (widgetType === "vabsearch" && !widget.options.multipleChoices);
+      let result
+        = widgetType === "singerSearch"
+        || (widgetType === "vabsearch" && !widget.options.multipleChoices);
       return result;
     },
     getColumnNullValue(widget) {
@@ -1815,9 +1815,9 @@ modules = {
 
       let defaultValue = widget.options.defaultValue;
       if (
-        defaultValue !== undefined &&
-        defaultValue !== null &&
-        defaultValue !== ""
+        defaultValue !== undefined
+        && defaultValue !== null
+        && defaultValue !== ""
       ) {
         nullValue = defaultValue;
       } else if (widgetType === "select" && widget.options.multiple) {
@@ -1980,13 +1980,13 @@ modules = {
           columnOption.required = row.required || false;
           columnSelectedWidget.options = columnOption;
           if ("editDelete" == formatS) {
-            columnSelectedWidget.options.hiddenByWf =
-              columnSelectedWidget.options.hiddenByWf ?? true;
-            columnSelectedWidget.options.prefixIcon =
-              columnSelectedWidget.options.prefixIcon || "el-icon-delete";
+            columnSelectedWidget.options.hiddenByWf
+              = columnSelectedWidget.options.hiddenByWf ?? true;
+            columnSelectedWidget.options.prefixIcon
+              = columnSelectedWidget.options.prefixIcon || "el-icon-delete";
           } else if ("editButton" == formatS) {
-            columnSelectedWidget.options.prefixIcon =
-              columnSelectedWidget.options.prefixIcon || "el-icon-edit";
+            columnSelectedWidget.options.prefixIcon
+              = columnSelectedWidget.options.prefixIcon || "el-icon-edit";
           }
         } else {
           columnSelectedWidget.options.required = row.required || false;
@@ -1995,44 +1995,44 @@ modules = {
             columnSelectedWidget.options.label = "删除";
             columnSelectedWidget.options.labelHidden = true;
             columnSelectedWidget.options.hiddenByWf = true;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.deleteRow(tableParam.row,tableParam.rowIndex);";
+            columnSelectedWidget.options.onClick
+              = "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.deleteRow(tableParam.row,tableParam.rowIndex);";
           } else if ("editButton" == formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-edit";
             columnSelectedWidget.options.label = "查看";
             columnSelectedWidget.options.labelHidden = true;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.openEditDialog(tableParam.row)";
+            columnSelectedWidget.options.onClick
+              = "let tableParam = this.tableParam;\nlet tableRef = this.getWidgetRef(this.parentWidget.options.name);\ntableRef.openEditDialog(tableParam.row)";
           } else if ("addSiblingEditRow" == formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "新增兄弟节点";
             columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nthis.getParentTarget().addSiblingTreeRow(null,tableParam);";
+            columnSelectedWidget.options.onClick
+              = "let tableParam = this.tableParam;\nthis.getParentTarget().addSiblingTreeRow(null,tableParam);";
           } else if ("addChildTreeRow" == formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "新增子节点";
             columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nthis.getParentTarget().addChildTreeRow(null,tableParam);";
+            columnSelectedWidget.options.onClick
+              = "let tableParam = this.tableParam;\nthis.getParentTarget().addChildTreeRow(null,tableParam);";
           } else if ("moveUpRow" == formatS) {
             // columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "↑上移";
             columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nthis.getParentTarget().moveUpRow(tableParam);";
+            columnSelectedWidget.options.onClick
+              = "let tableParam = this.tableParam;\nthis.getParentTarget().moveUpRow(tableParam);";
           } else if ("moveDownRow" == formatS) {
             // columnSelectedWidget.options.prefixIcon = "el-icon-plus";
             columnSelectedWidget.options.label = "↓下移";
             columnSelectedWidget.options.labelHidden = false;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nthis.getParentTarget().moveDownRow(tableParam);";
+            columnSelectedWidget.options.onClick
+              = "let tableParam = this.tableParam;\nthis.getParentTarget().moveDownRow(tableParam);";
           } else if ("removeTreeRow" == formatS) {
             columnSelectedWidget.options.prefixIcon = "el-icon-delete";
             columnSelectedWidget.options.label = "删除";
             columnSelectedWidget.options.labelHidden = true;
-            columnSelectedWidget.options.onClick =
-              "let tableParam = this.tableParam;\nthis.getParentTarget().removeTreeRow(tableParam);";
+            columnSelectedWidget.options.onClick
+              = "let tableParam = this.tableParam;\nthis.getParentTarget().removeTreeRow(tableParam);";
           }
           columnOption = columnSelectedWidget.options;
         }
@@ -2200,8 +2200,8 @@ modules = {
       }
       let formRef = this.getFormRef();
       let dataTableConfig = formRef.$attrs.dataTableOption || {};
-      dataTableConfig.onCheckboxChange &&
-        dataTableConfig.onCheckboxChange(param);
+      dataTableConfig.onCheckboxChange
+        && dataTableConfig.onCheckboxChange(param);
     },
     handleCheckboxAll(param) {
       if (this.widget.options.onCheckboxAll) {
@@ -2359,9 +2359,10 @@ modules = {
           editDefaultRow = originOption.editDefaultRow || {};
         }
       }
+      
       // Object.assign(newRow, editDefaultRow, rowData);
-      newRow.id =
-        "row_" + new Date().valueOf() + Math.floor(Math.random() * 1000000);
+      newRow.id
+        = "row_" + new Date().valueOf() + Math.floor(Math.random() * 1000000);
       if (!toSibling) {
         newRow[parentField] = parent?.id || 0;
       } else {
@@ -2376,8 +2377,8 @@ modules = {
         if (toEnd === true) {
           tableRows.push(newRow);
         } else if (toSibling === true) {
-          let addIndex =
-            tableRows.findIndex(
+          let addIndex
+            = tableRows.findIndex(
               (item) => item._X_ROW_KEY == obj.row._X_ROW_KEY
             ) + 1;
           tableRows.splice(addIndex, 0, newRow);
@@ -2398,8 +2399,8 @@ modules = {
           if (toEnd === true) {
             tableRows.push(newRow);
           } else if (toSibling === true) {
-            let addIndex =
-              tableRows.findIndex(
+            let addIndex
+              = tableRows.findIndex(
                 (item) => item._X_ROW_KEY == obj.row._X_ROW_KEY
               ) + 1;
             tableRows.splice(addIndex, 0, newRow);
@@ -2428,8 +2429,8 @@ modules = {
       if (row[childrenField]) {
         let loopDo = (item) => {
           if (item.id) delIds.push(item.id);
-          item[childrenField] &&
-            item[childrenField].forEach((subItem) => {
+          item[childrenField]
+            && item[childrenField].forEach((subItem) => {
               loopDo(subItem);
             });
         };
@@ -2470,8 +2471,8 @@ modules = {
         }
       }
       // Object.assign(newRow, editDefaultRow, rowData);
-      newRow.id =
-        "row_" + new Date().valueOf() + Math.floor(Math.random() * 1000000);
+      newRow.id
+        = "row_" + new Date().valueOf() + Math.floor(Math.random() * 1000000);
       if (!toSibling) {
         newRow[parentField] = parent?.id || 0;
       } else {
@@ -2486,8 +2487,8 @@ modules = {
         if (toEnd === true) {
           tableRows.push(newRow);
         } else if (toSibling === true) {
-          let addIndex =
-            tableRows.findIndex(
+          let addIndex
+            = tableRows.findIndex(
               (item) => item._X_ROW_KEY == obj.row._X_ROW_KEY
             ) + 1;
           tableRows.splice(addIndex, 0, newRow);
@@ -2508,8 +2509,8 @@ modules = {
           if (toEnd === true) {
             tableRows.push(newRow);
           } else if (toSibling === true) {
-            let addIndex =
-              tableRows.findIndex(
+            let addIndex
+              = tableRows.findIndex(
                 (item) => item._X_ROW_KEY == obj.row._X_ROW_KEY
               ) + 1;
             tableRows.splice(addIndex, 0, newRow);
@@ -2554,8 +2555,8 @@ modules = {
       let loopDo = (item, wbs) => {
         item.f_wbs = wbs;
         map[item._X_ROW_KEY] = wbs;
-        item[childrenField] &&
-          item[childrenField].forEach((subitem, subindex) => {
+        item[childrenField]
+          && item[childrenField].forEach((subitem, subindex) => {
             let sub_wbs = wbs + "." + (subindex + 1) + "";
             loopDo(subitem, sub_wbs);
           });