cloud-web-corejs 1.1.0-dev.22 → 1.1.0-dev.24

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

@@ -62,6 +62,9 @@
     <el-form-item label="是否查询总页数">
       <el-switch v-model="isQueryAllPage"></el-switch>
     </el-form-item>
+    <el-form-item label="是否读取总页数记忆">
+      <el-switch v-model="isReadQueryAllPage"></el-switch>
+    </el-form-item>
     <el-form-item label="默认每页查询数" class="form-item-label-top">
       <base-input-number
         v-model="optionModel.gridPageSize"
@@ -308,6 +311,221 @@
     <el-form-item :label="i18nt('树表格')">
       <el-switch v-model="optionModel.isTreeTable"></el-switch>
     </el-form-item>
+    <el-form-item
+      label="详细设置"
+      v-if="optionModel.isEditTable || optionModel.isTreeTable"
+    >
+      <el-button
+        type="primary"
+        plain
+        round
+        icon="el-icon-setting"
+        @click="openEditTableConfigDialog"
+      >维护配置</el-button>
+    </el-form-item>
+    <el-dialog
+      v-if="showEditTableConfigDialog"
+      title="编辑表格设置"
+      :visible.sync="showEditTableConfigDialog"
+      append-to-body
+      :close-on-click-modal="false"
+      :destroy-on-close="true"
+      width="720px"
+      custom-class="dialog-style list-dialog fixed-tabs-dialog"
+      v-dialog-drag
+      v-el-dialog-center
+    >
+      <el-form
+        label-width="150px"
+        size="small"
+        class="cont fixed-tabs-dialog__content"
+      >
+        <el-tabs
+          v-model="editTableConfigTab"
+          class="fixed-tabs-dialog__tabs"
+        >
+          <el-tab-pane
+            v-if="optionModel.isEditTable"
+            label="行编辑与保存"
+            name="row"
+          >
+      <el-form-item label="新增行默认值">
+        <a
+          href="javascript:void(0);"
+          class="a-link link-oneLind"
+          @click="editEventHandler('editDefaultRow', defaultEventParams)"
+        >
+          <span>{{ optionModel.editDefaultRow }}</span>
+          <i class="el-icon-edit"></i>
+        </a>
+      </el-form-item>
+      <el-form-item label="整行可编辑条件">
+        <a
+          href="javascript:void(0);"
+          class="a-link link-oneLind"
+          @click="editEventHandler('rowEditableScript', defaultEventParams.concat('tableParam'))"
+        >
+          <span>{{ optionModel.rowEditableScript }}</span>
+          <i class="el-icon-edit"></i>
+        </a>
+      </el-form-item>
+      <el-form-item label="行新增条件">
+        <a
+          href="javascript:void(0);"
+          class="a-link link-oneLind"
+          @click="editEventHandler('rowAddableScript', defaultEventParams.concat('tableParam'))"
+        >
+          <span>{{ optionModel.rowAddableScript }}</span>
+          <i class="el-icon-edit"></i>
+        </a>
+      </el-form-item>
+      <el-form-item label="行删除条件">
+        <a
+          href="javascript:void(0);"
+          class="a-link link-oneLind"
+          @click="editEventHandler('rowDeletableScript', defaultEventParams.concat('tableParam'))"
+        >
+          <span>{{ optionModel.rowDeletableScript }}</span>
+          <i class="el-icon-edit"></i>
+        </a>
+      </el-form-item>
+      <el-form-item label="单行保存脚本编码" class="form-item-label-top">
+        <el-input v-model="optionModel.rowSaveScriptCode" clearable></el-input>
+      </el-form-item>
+      <el-form-item label="保存前脚本">
+        <a
+          href="javascript:void(0);"
+          class="a-link link-oneLind"
+          @click="editEventHandler('beforeRowSave', defaultEventParams.concat(['rowData', 'tableParam']))"
+        >
+          <span>{{ optionModel.beforeRowSave }}</span>
+          <i class="el-icon-edit"></i>
+        </a>
+      </el-form-item>
+      <el-form-item label="保存后脚本">
+        <a
+          href="javascript:void(0);"
+          class="a-link link-oneLind"
+          @click="editEventHandler('afterRowSave', defaultEventParams.concat(['rowData', 'res']))"
+        >
+          <span>{{ optionModel.afterRowSave }}</span>
+          <i class="el-icon-edit"></i>
+        </a>
+      </el-form-item>
+      <el-form-item label="保存失败脚本">
+        <a
+          href="javascript:void(0);"
+          class="a-link link-oneLind"
+          @click="editEventHandler('onRowSaveError', defaultEventParams.concat(['error', 'rowData']))"
+        >
+          <span>{{ optionModel.onRowSaveError }}</span>
+          <i class="el-icon-edit"></i>
+        </a>
+      </el-form-item>
+          </el-tab-pane>
+          <el-tab-pane
+            v-if="optionModel.isEditTable"
+            label="复制粘贴与自动保存"
+            name="clipboard"
+          >
+      <el-form-item label="启用复制粘贴">
+        <el-switch v-model="optionModel.clipboardEnabled"></el-switch>
+      </el-form-item>
+      <el-form-item
+        :label="optionModel.isTreeTable ? '粘贴时自动新增一级节点' : '粘贴时自动新增行'"
+        v-if="optionModel.clipboardEnabled"
+      >
+        <el-switch v-model="optionModel.clipboardRowIncrementEnabled"></el-switch>
+      </el-form-item>
+      <el-form-item v-if="optionModel.clipboardEnabled">
+        <span slot="label">
+          支持附件粘贴
+          <el-tooltip effect="light" placement="top">
+            <div slot="content" class="field-tip-content">
+              选中附件单元格后，可粘贴截图或从文件管理器复制的文件。<br />
+              仅对附件类型的可编辑列生效。
+            </div>
+            <i class="el-icon-info label-tip-icon"></i>
+          </el-tooltip>
+        </span>
+        <el-switch v-model="optionModel.clipboardAttachmentEnabled"></el-switch>
+      </el-form-item>
+      <el-form-item label="复制粘贴排除字段" v-if="optionModel.clipboardEnabled">
+        <el-select
+          v-model="optionModel.clipboardExcludeFields"
+          multiple
+          filterable
+          allow-create
+          default-first-option
+          style="width: 100%"
+        ></el-select>
+      </el-form-item>
+      <el-form-item label="非法粘贴值处理" v-if="optionModel.clipboardEnabled">
+        <el-select v-model="optionModel.clipboardInvalidValueStrategy" style="width: 100%">
+          <el-option label="跳过" value="ignore"></el-option>
+          <el-option label="跳过并提示" value="warn"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <span slot="label">
+          启用自动保存
+          <el-tooltip effect="light" placement="top">
+            <div slot="content" class="field-tip-content">
+              行内输入组件失去焦点或粘贴完成后，自动执行单行保存。<br />
+              附件列会等待文件上传完成后再保存。
+            </div>
+            <i class="el-icon-info label-tip-icon"></i>
+          </el-tooltip>
+        </span>
+        <el-switch v-model="optionModel.autoSaveEnabled"></el-switch>
+      </el-form-item>
+      <el-form-item label="自动保存触发方式" v-if="optionModel.autoSaveEnabled">
+        <el-checkbox-group v-model="optionModel.autoSaveTrigger">
+          <el-checkbox label="blur">失焦</el-checkbox>
+          <el-checkbox label="change">值变化</el-checkbox>
+          <el-checkbox label="paste">粘贴</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <el-form-item label="自动保存延迟（ms）" v-if="optionModel.autoSaveEnabled">
+        <base-input-number
+          v-model="optionModel.autoSaveDelay"
+          :min="0"
+          :max="5000"
+          style="width: 100%"
+        />
+      </el-form-item>
+          </el-tab-pane>
+          <el-tab-pane
+            v-if="optionModel.isTreeTable"
+            label="树结构"
+            name="tree"
+          >
+      <el-form-item label="节点键字段"><el-input v-model="optionModel.treeConfig.rowField" /></el-form-item>
+      <el-form-item label="父节点字段"><el-input v-model="optionModel.treeConfig.parentField" /></el-form-item>
+      <el-form-item label="子节点字段"><el-input v-model="optionModel.treeConfig.children" /></el-form-item>
+      <el-form-item label="映射子节点字段"><el-input v-model="optionModel.treeConfig.mapChildren" /></el-form-item>
+      <el-form-item label="有子节点标识字段"><el-input v-model="optionModel.treeConfig.hasChild" /></el-form-item>
+      <el-form-item label="默认展开全部"><el-switch v-model="optionModel.treeConfig.expandAll" /></el-form-item>
+      <el-form-item label="懒加载"><el-switch v-model="optionModel.treeConfig.lazy" /></el-form-item>
+      <el-form-item label="物理主键字段"><el-input v-model="optionModel.treeIdentityConfig.physicalIdField" /></el-form-item>
+      <el-form-item label="根节点父值"><el-input v-model="optionModel.treeIdentityConfig.rootParentValue" /></el-form-item>
+      <el-form-item label="粘贴补行位置">
+        <el-select v-model="optionModel.treePasteInsertMode" style="width: 100%">
+          <el-option label="新增一级节点" value="root" />
+          <el-option label="新增同级节点" value="sibling" />
+        </el-select>
+      </el-form-item>
+          </el-tab-pane>
+        </el-tabs>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          icon="el-icon-check"
+          @click="showEditTableConfigDialog = false"
+        >完成</el-button>
+      </span>
+    </el-dialog>
     <el-form-item :label="i18nt('启用WBS码')">
       <el-switch v-model="optionModel.wbsEnabled"></el-switch>
     </el-form-item>
@@ -722,7 +940,94 @@ export default {
       tableConfigParams: ["dataId", "formCode"],
       defaultEventParams: ["dataId", "formCode"],
       showExportItemColumnsDialog: false,
+      showEditTableConfigDialog: false,
+      editTableConfigTab: "row",
+    };
+  },
+  created() {
+    const defaults = {
+      mergeRowEnabled: false,
+      mergeRowKey: null,
+      showGridFooter: false,
+      editDefaultRow: null,
+      rowEditableScript: null,
+      rowAddableScript: null,
+      rowDeletableScript: null,
+      rowSaveScriptCode: null,
+      beforeRowSave: null,
+      afterRowSave: null,
+      onRowSaveError: null,
+      clipboardEnabled: false,
+      clipboardRowIncrementEnabled: false,
+      clipboardAttachmentEnabled: false,
+      clipboardExcludeFields: [],
+      clipboardInvalidValueStrategy: "ignore",
+      clipboardAutoSaveEnabled: false,
+      autoSaveTrigger: ["blur", "change", "paste"],
+      autoSaveDelay: 200,
+      treePasteInsertMode: "root",
+    };
+    Object.keys(defaults).forEach((key) => {
+      if (!Object.prototype.hasOwnProperty.call(this.optionModel, key)) {
+        this.$set(this.optionModel, key, defaults[key]);
+      }
+    });
+    if (!Object.prototype.hasOwnProperty.call(this.optionModel, "autoSaveEnabled")) {
+      this.$set(
+        this.optionModel,
+        "autoSaveEnabled",
+        !!this.optionModel.clipboardAutoSaveEnabled
+      );
+    }
+    const nestedDefaults = {
+      treeConfig: {
+        rowField: "id",
+        parentField: "f_parent",
+        children: "f_children",
+        mapChildren: "_X_ROW_CHILD",
+        hasChild: "f_has_child",
+        lazy: false,
+        expandAll: true,
+        reserve: true,
+      },
+      treeIdentityConfig: {
+        physicalIdField: "id",
+        rootParentValue: 0,
+        serverGeneratesRowField: true,
+        persistedRowFieldChangeStrategy: "reject",
+      },
+      treeCopyConfig: {
+        rowFieldStrategy: "regenerate",
+        orphanParentStrategy: "detach",
+        lazyStrategy: "reject",
+      },
+      treeSubmitConfig: {
+        orphanParentStrategy: "preserve",
+        unloadedChildrenStrategy: "reject",
+        successReconcileStrategy: "reload",
+      },
     };
+    Object.keys(nestedDefaults).forEach((key) => {
+      const current = this.optionModel[key];
+      if (!current || typeof current !== "object") {
+        this.$set(this.optionModel, key, { ...nestedDefaults[key] });
+        return;
+      }
+      Object.keys(nestedDefaults[key]).forEach((childKey) => {
+        if (!Object.prototype.hasOwnProperty.call(current, childKey)) {
+          this.$set(current, childKey, nestedDefaults[key][childKey]);
+        }
+      });
+    });
+    var e = this;
+    (this.cssClassList = deepClone(this.designer.getCssClassList())),
+      this.designer.handleEvent("form-css-updated", function (t) {
+        e.cssClassList = t;
+      });
+    if (this.optionModel.showExportBtn == null)
+      this.$set(this.optionModel, "showExportBtn", true);
+    if (this.optionModel.tableConfig === void 0)
+      this.$set(this.optionModel, "tableConfig", "");
   },
   computed: {
     dataSourceList: function () {
@@ -741,6 +1046,14 @@ export default {
         this.optionModel.isNotQueryAllPage = !val;
       },
     },
+    isReadQueryAllPage: {
+      get() {
+        return !this.optionModel.isNotReadQueryAllPage;
+      },
+      set(val) {
+        this.optionModel.isNotReadQueryAllPage = !val;
+      },
+    },
     isShowQueryButton: {
       get() {
         return !this.optionModel.isNotShowQueryButton;
@@ -753,18 +1066,6 @@ export default {
       return this.optionModel.dynamicSchemaConvert || "";
     },
   },
-  created: function () {
-    // this.reportTemplate = this.getReportTemplate();
-    var e = this;
-    (this.cssClassList = deepClone(this.designer.getCssClassList())),
-      this.designer.handleEvent("form-css-updated", function (t) {
-        e.cssClassList = t;
-      });
-    if (this.optionModel.showExportBtn == null)
-      this.$set(this.optionModel, "showExportBtn", true);
-    if (this.optionModel.tableConfig === void 0)
-      this.$set(this.optionModel, "tableConfig", "");
-  },
   mounted: function () {
     const preloadColumnDialog = () => {
       this.columnDialogMounted = true;
@@ -776,6 +1077,10 @@ export default {
     }
   },
   methods: {
+    openEditTableConfigDialog() {
+      this.editTableConfigTab = this.optionModel.isEditTable ? "row" : "tree";
+      this.showEditTableConfigDialog = true;
+    },
     editDynamicSchemaConvert() {
       this.editEventHandler("dynamicSchemaConvert", ["res"]);
     },
@@ -1104,6 +1409,7 @@ export default {
 .icon-drag:before {
   content: "\e61d";
 }
+
 </style>
 
 <style scoped>

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

@@ -534,7 +534,7 @@
           <el-form-item :label="i18nt('designer.setting.visibleColumn')">
             <el-switch v-model="rowData.show"></el-switch>
           </el-form-item>
-          <el-form-item label="动态显示脚本">
+          <el-form-item label="动态显示脚本">
             <a
               href="javascript:void(0);"
               class="a-link link-oneLind"
@@ -542,8 +542,21 @@
             >
               <span>{{ rowData.columnShow }}</span>
               <i class="el-icon-edit"></i>
-            </a>
-          </el-form-item>
+            </a>
+          </el-form-item>
+          <el-form-item
+            label="单元格可编辑条件"
+            v-if="rowData.editFormatS"
+          >
+            <a
+              href="javascript:void(0);"
+              class="a-link link-oneLind"
+              @click="editFormEventHandler(rowData, rowDataIndex, 'cellEditable')"
+            >
+              <span>{{ rowData.cellEditable }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
           <el-form-item :label="i18nt('designer.setting.sortableColumn')">
             <el-switch v-model="rowData.sortable"></el-switch>
           </el-form-item>
@@ -1021,8 +1034,10 @@ export default {
       curEventRow: null,
 
       eventParamsMap: {
-        footerMethodConfg: "footerMethodConfg(dataId,formCode,param) {",
-        columnShow: "columnShow(dataId,formCode,columnConfig) {",
+        footerMethodConfg: "footerMethodConfg(dataId,formCode,param) {",
+        columnShow: "columnShow(dataId,formCode,columnConfig) {",
+        cellEditable:
+          "cellEditable(dataId,formCode,tableParam,columnConfig) {",
       },
 
       showColumnRenderDialog: false,
@@ -1388,8 +1403,9 @@ export default {
         rowAddAuthName: this.createRowAuthName("Add"),
         rowEditAuthName: this.createRowAuthName("Edit"),
         rowAddShow: null,
-        rowEditShow: null,
-        columnShow: null,
+        rowEditShow: null,
+        columnShow: null,
+        cellEditable: null,
         utcTransformEnabled: false,
         labelIconClass: null,
         labelIconPosition: "rear",

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

@@ -320,6 +320,53 @@ export const containers = [
       tableConfig: null,
       isEditTable: false,
       isTreeTable: false,
+      mergeRowEnabled: false,
+      mergeRowKey: null,
+      showGridFooter: false,
+      editDefaultRow: null,
+      rowEditableScript: null,
+      rowAddableScript: null,
+      rowDeletableScript: null,
+      rowSaveScriptCode: null,
+      beforeRowSave: null,
+      afterRowSave: null,
+      onRowSaveError: null,
+      clipboardEnabled: false,
+      clipboardRowIncrementEnabled: false,
+      clipboardAttachmentEnabled: false,
+      clipboardExcludeFields: [],
+      clipboardInvalidValueStrategy: "ignore",
+      clipboardAutoSaveEnabled: false,
+      autoSaveEnabled: false,
+      autoSaveTrigger: ["blur", "change", "paste"],
+      autoSaveDelay: 200,
+      treeConfig: {
+        rowField: "id",
+        parentField: "f_parent",
+        children: "f_children",
+        mapChildren: "_X_ROW_CHILD",
+        hasChild: "f_has_child",
+        lazy: false,
+        expandAll: true,
+        reserve: true,
+      },
+      treeIdentityConfig: {
+        physicalIdField: "id",
+        rootParentValue: 0,
+        serverGeneratesRowField: true,
+        persistedRowFieldChangeStrategy: "reject",
+      },
+      treeCopyConfig: {
+        rowFieldStrategy: "regenerate",
+        orphanParentStrategy: "detach",
+        lazyStrategy: "reject",
+      },
+      treeSubmitConfig: {
+        orphanParentStrategy: "preserve",
+        unloadedChildrenStrategy: "reject",
+        successReconcileStrategy: "reload",
+      },
+      treePasteInsertMode: "root",
       wbsEnabled: false,
       sortScriptCode: null,
       importTemplateFile: null,
@@ -330,6 +377,7 @@ export const containers = [
       showRules: [],
       hideGridCheckBox: false,
       isNotQueryAllPage: false,
+      isNotReadQueryAllPage: false,
       isNotShowQueryButton: false,
 
       exportItemColumns: [],

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

@@ -1,7 +1,8 @@
 <template>
-  <vxe-grid
-    :ref="widget.id"
-    v-bind="vxeOption"
+  <vxe-grid
+    :ref="widget.id"
+    v-bind="vxeOption"
+    :style="dataTableStyle"
     :auto-resize="true"
     v-show="!widget.options.hidden"
     @resizable-change="$vxeTableUtil.onColumnWitchChange"
@@ -76,8 +77,9 @@
             plain
             >{{ $t1("刷新") }}
           </vxe-button>
-          <vxe-button
-            status="warning"
+          <vxe-button
+            v-if="!widget.options.isNotShowQueryButton"
+            status="warning"
             icon="el-icon-search"
             class="button-sty"
             @click="handleSearchClick"
@@ -262,7 +264,7 @@
             @click="removeEditRow(obj)"
             class="a-link"
             data-tit="删除"
-            v-if="!hasSaveRow(obj.row)"
+            v-if="!hasSaveRow(obj.row) && canDeleteTableRow(obj)"
           >
             <el-tooltip
               :enterable="false"