cloud-web-corejs 1.0.245 → 1.0.247

package/package.json

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

package/src/components/xform/form-designer/form-widget/container-widget/data-table-widget.vue

@@ -190,6 +190,7 @@ import TableCellWidget from '../../../../../components/xform/form-designer/form-
 import FieldComponents from '../../../../../components/xform/form-designer/form-widget/field-widget/index';
 import Draggable from 'vuedraggable';
 import dataTableMixin from './data-table-mixin.js';
+import { enrichTableColumnsWithLabelIcon } from '../../../utils/tableColumnHelper';
 
 export default {
   name: 'data-table-widget',
@@ -200,6 +201,15 @@ export default {
     ...FieldComponents
   },
   mixins: [dataTableMixin],
+  computed: {
+    columns() {
+      const baseColumns = dataTableMixin.computed.columns.call(this);
+      return enrichTableColumnsWithLabelIcon(
+        baseColumns,
+        this.widget.options.tableColumns || []
+      );
+    },
+  },
   created() {
     if(this.widget.options.isNotQueryAllPage===undefined)this.widget.options.isNotQueryAllPage = false;
   }

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

@@ -22,20 +22,33 @@
           </template>
           <template
             v-else-if="
-              field.options.widgetTextFlag === 3 && field.options.widgetTextLinkConfig
+              field.options.widgetTextFlag === 3 &&
+              field.options.widgetTextLinkConfig
             "
           >
             <div class="ellipsis">
-              <a class="a-link" :class="getWidgetClass()" @click.native="handleClick">
+              <a
+                class="a-link"
+                :class="getWidgetClass()"
+                @click.native="handleClick"
+              >
                 <span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.prefixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.prefixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
                   ></i>
                   <span>{{ getWidgetValue() }}</span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.suffixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.suffixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
                   ></i>
                 </span>
               </a>
@@ -48,10 +61,12 @@
       </template>
       <template v-else>
         <el-form-item
-          v-if="!!field.formItemFlag && (!field.options.hidden || designState === true)"
+          v-if="
+            !!field.formItemFlag &&
+            (!field.options.hidden || designState === true)
+          "
           :label="label"
           :label-width="labelWidth"
-          :title="field.options.labelTooltip"
           :rules="getRules()"
           :prop="getPropName()"
           :class="[
@@ -66,31 +81,48 @@
             v-if="!!field.options.labelIconClass"
             slot="label"
             class="custom-label"
-            :style="{ color: field.options.labelColor }"
           >
             <template v-if="field.options.labelIconPosition === 'front'">
               <template v-if="!!field.options.labelTooltip">
-                <el-tooltip :content="field.options.labelTooltip" effect="light">
+                <el-tooltip
+                  :content="field.options.labelTooltip"
+                  effect="dark"
+                  popper-class="label-tooltip-pre-line"
+                >
                   <i :class="field.options.labelIconClass"></i></el-tooltip
-                >{{ label }}</template
+                ><span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span></template
               >
               <template v-else>
-                <i :class="field.options.labelIconClass"></i>{{ label }}</template
+                <i :class="field.options.labelIconClass"></i
+                ><span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span></template
               >
             </template>
             <template v-else-if="field.options.labelIconPosition === 'rear'">
               <template v-if="!!field.options.labelTooltip">
-                {{ label
-                }}<el-tooltip :content="field.options.labelTooltip" effect="light">
+                <span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span
+                ><el-tooltip
+                  :content="field.options.labelTooltip"
+                  effect="dark"
+                  popper-class="label-tooltip-pre-line"
+                >
                   <i :class="field.options.labelIconClass"></i></el-tooltip
               ></template>
               <template v-else>
-                {{ label }}<i :class="field.options.labelIconClass"></i
+                <span :style="{ color: field.options.labelColor }">{{
+                  label
+                }}</span
+                ><i :class="field.options.labelIconClass"></i
               ></template>
             </template>
           </span>
           <span
-            v-if="!!field.options.labelColor"
+            v-else-if="!!field.options.labelColor"
             slot="label"
             :style="{ color: field.options.labelColor }"
           >
@@ -101,20 +133,29 @@
           </template>
           <template
             v-else-if="
-              field.options.widgetTextFlag === 3 && field.options.widgetTextLinkConfig
+              field.options.widgetTextFlag === 3 &&
+              field.options.widgetTextLinkConfig
             "
           >
             <div class="ellipsis">
               <a class="a-link" :class="getWidgetClass()" @click="handleClick">
                 <span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.prefixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.prefixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.prefixIcon
+                    "
                   ></i>
                   <span>{{ getWidgetValue() }}</span>
                   <i
-                    :class="field.options.widgetTextLinkConfig.options.suffixIcon"
-                    v-if="!!field.options.widgetTextLinkConfig.options.suffixIcon"
+                    :class="
+                      field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
+                    v-if="
+                      !!field.options.widgetTextLinkConfig.options.suffixIcon
+                    "
                   ></i>
                 </span>
               </a>
@@ -171,7 +212,10 @@
 
 <script>
 import i18n from "../../../../../components/xform/utils/i18n";
-import { getSubFormNameByFieldId } from "../../../../../components/xform/utils/util";
+import {
+  getSubFormNameByFieldId,
+  isVabsearchMultiWidget,
+} from "../../../../../components/xform/utils/util";
 
 export default {
   name: "form-item-wrapper",
@@ -225,7 +269,7 @@ export default {
     },
 
     label() {
-      if (!!this.field.options.labelHidden) {
+      if (this.shouldHideFieldLabel()) {
         return "";
       }
       return this.getI18nLabel(this.field.options.label);
@@ -234,7 +278,7 @@ export default {
     },
 
     labelWidth() {
-      if (!!this.field.options.labelHidden) {
+      if (this.shouldHideFieldLabel()) {
         return (!!this.designState ? 5 : 0) + "px"; //设计期间标签最小宽度5像素，以便于鼠标点击可选中组件！！
       }
 
@@ -286,6 +330,13 @@ export default {
     this.initShowType();
   },
   methods: {
+    shouldHideFieldLabel() {
+      if (!!this.field.options.labelHidden) {
+        return true;
+      }
+      // 数据表格列内字段：表头已展示列名，隐藏 form-item 标签
+      return this.isSubFormItem();
+    },
     isSubFormItem() {
       return !!this.tableParam;
     },
@@ -330,7 +381,10 @@ export default {
         }
 
         this.$nextTick(() => {
-          const l = getSubFormNameByFieldId(this.designer.widgetList, selectedId);
+          const l = getSubFormNameByFieldId(
+            this.designer.widgetList,
+            selectedId
+          );
           this.parentList.splice(this.indexOfParentList, 1);
           //if (!!nextSelected) {
           this.designer.setSelected(nextSelected);
@@ -341,25 +395,30 @@ export default {
         });
       }
     },
-    getIsFormItemUnabled() {
-      return this.field.type == "vabUpload" || this.field.type == "baseAttachment";
-    },
     getRules() {
-      if (this.getIsFormItemUnabled()) {
-        return null;
-      }
       return this.rules;
     },
     getPropName() {
-      if (this.getIsFormItemUnabled()) {
+      if (this.formItemProp === "false") {
         return null;
       }
-      if (this.formItemProp) {
-        return this.formItemProp;
+      // if (this.formItemProp) {
+      //   return this.formItemProp;
+      // }
+      if (this.tableParam && !this.tableParam.$table?.$parent?.$parent) {
+        if (this.formItemProp) {
+          return this.formItemProp;
+        }
+        return null;
+      }
+      if (this.tableParam && !!this.tableParam.$table?.$parent?.$parent) {
+        return this.getColumnProp(this.field, this.tableParam);
       }
       let o = this.field.options.name;
       let propName =
-        ((o = (this.field.options.keyNameEnabled && this.field.options.keyName) || o),
+        ((o =
+          (this.field.options.keyNameEnabled && this.field.options.keyName) ||
+          o),
         this.subFormItemFlag && !this.designState
           ? this.subFormName + "." + this.subFormRowIndex + "." + o
           : this.getObjectFieldFlag() && !this.designState
@@ -368,6 +427,49 @@ export default {
 
       return propName;
     },
+    getFieldKeyName(widget) {
+      let o = widget.options.name;
+      return (widget.options.keyNameEnabled && widget.options.keyName) || o;
+    },
+    isVabsearchFlagWidget(widget) {
+      let type = widget?.type;
+      return (
+        type === "vabsearch" ||
+        type === "singerSearch" ||
+        type === "multiSearch"
+      );
+    },
+    getColumnProp(rowWidget, obj) {
+      let required = rowWidget.options.required || false;
+
+      let tableRef = obj.$table.$parent.$parent;
+      let tableWidget = tableRef.widget;
+      let fieldKeyName = this.getFieldKeyName(tableWidget);
+      let property = this.getFieldKeyName(rowWidget);
+      if (
+        this.isVabsearchFlagWidget(rowWidget) &&
+        !isVabsearchMultiWidget(rowWidget)
+      ) {
+        property = rowWidget.options.vabSearchName || property;
+      }
+      let rowIndex = Math.max(obj.rowIndex, 0);
+
+      let isTreeTable = tableWidget.options.isTreeTable || false;
+      if (isTreeTable) {
+        rowIndex = tableRef
+          .getValue()
+          .findIndex((item) => item._X_ROW_KEY === obj.row._X_ROW_KEY);
+        if (rowIndex < 0) {
+          return "false";
+        }
+      }
+
+      let propName = fieldKeyName + "." + rowIndex + "." + property;
+      if (!required) {
+        propName = "false";
+      }
+      return propName;
+    },
     getI18nLabel(label, path, param) {
       return !this.designState && label ? this.$t2(label, path, param) : label;
     },
@@ -509,7 +611,8 @@ export default {
               : [];
 
             let flag1 = !item.serveName || item.serveName == bdService;
-            let flag2 = !companyCodes.length || companyCodes.includes(companyCode);
+            let flag2 =
+              !companyCodes.length || companyCodes.includes(companyCode);
             // let flag3 = !loginAccounts.length || loginAccounts.includes(loginAccount)
             // let flag4 = this.compareToList(saleOrgCodes, saleOrgCodeList)
             if (flag1 && flag2) {
@@ -543,13 +646,16 @@ export default {
     isShowWidget() {
       let widgetTextFlag = this.field.options.widgetTextFlag;
       return (
-        widgetTextFlag === undefined || widgetTextFlag === null || widgetTextFlag === 0
+        widgetTextFlag === undefined ||
+        widgetTextFlag === null ||
+        widgetTextFlag === 0
       );
     },
     getShowValue() {
       let widgetTextFlag = this.field.options.widgetTextFlag;
       let fieldModel = this.$parent.fieldModel;
-      if (this.$parent.fieldModelLabel) fieldModel = this.$parent.fieldModelLabel();
+      if (this.$parent.fieldModelLabel)
+        fieldModel = this.$parent.fieldModelLabel();
       let showValue = fieldModel;
       if (widgetTextFlag == 2) {
         showValue = this.getProcessText(showValue, this.encryptFormula);
@@ -568,13 +674,17 @@ export default {
     handleClick(event) {
       if (this.field.options.disabled) return;
       this.$parent.handleButtonWidgetClick(event, true);
-      if (!this.designState && this.field.options.widgetTextLinkConfig?.options.href) {
+      if (
+        !this.designState &&
+        this.field.options.widgetTextLinkConfig?.options.href
+      ) {
         window.open(this.field.options.widgetTextLinkConfig?.options.href);
       }
     },
     getWidgetValue() {
       let fieldModel = this.$parent.fieldModel;
-      if (this.$parent.fieldModelLabel) fieldModel = this.$parent.fieldModelLabel();
+      if (this.$parent.fieldModelLabel)
+        fieldModel = this.$parent.fieldModelLabel();
       return fieldModel;
     },
   },

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/edit-tree-button-group-config-dialog.vue

@@ -0,0 +1,281 @@
+<template>
+  <el-dialog
+    title="编辑行按钮组配置"
+    :visible.sync="dialogVisible"
+    custom-class="dialog-style list-dialog"
+    :show-close="true"
+    append-to-body
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    :destroy-on-close="true"
+    width="520px"
+    v-dialog-drag
+    @close="handleClose"
+  >
+    <div class="cont">
+      <el-form label-width="166px" class="edit-tree-button-group-form">
+        <el-form-item label="新增按钮唯一名称">
+          <el-input
+            v-model="row.rowAddAuthName"
+            class="all-width"
+            placeholder="留空则不校验权限"
+            clearable
+          >
+            <el-tooltip
+              slot="suffix"
+              :enterable="false"
+              effect="dark"
+              content="随机生成"
+              placement="top"
+            >
+              <i
+                class="el-input__icon el-icon-refresh-right"
+                @click="createRandomRowAddAuthName"
+              ></i>
+            </el-tooltip>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="新增按钮编码" v-if="rowAddAuthCode">
+          <div class="auth-code-text">
+            <el-tooltip effect="light" content="复制">
+              <a
+                class="a-link"
+                style="color: unset"
+                @click="copyAuthCode(rowAddAuthCode, $event)"
+              >
+                <span
+                  ><i
+                    class="el-icon-copy-document"
+                    style="margin-right: 2px"
+                  ></i
+                  >{{ rowAddAuthCode }}</span
+                >
+              </a>
+            </el-tooltip>
+          </div>
+        </el-form-item>
+        <el-form-item label="编辑按钮唯一名称">
+          <el-input
+            v-model="row.rowEditAuthName"
+            class="all-width"
+            placeholder="留空则不校验权限"
+            clearable
+          >
+            <el-tooltip
+              slot="suffix"
+              :enterable="false"
+              effect="dark"
+              content="随机生成"
+              placement="top"
+            >
+              <i
+                class="el-input__icon el-icon-refresh-right"
+                @click="createRandomRowEditAuthName"
+              ></i>
+            </el-tooltip>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="编辑按钮编码" v-if="rowEditAuthCode">
+          <div class="auth-code-text">
+            <el-tooltip effect="light" content="复制">
+              <a
+                class="a-link"
+                style="color: unset"
+                @click="copyAuthCode(rowEditAuthCode, $event)"
+              >
+                <span
+                  ><i
+                    class="el-icon-copy-document"
+                    style="margin-right: 2px"
+                  ></i
+                  >{{ rowEditAuthCode }}</span
+                >
+              </a>
+            </el-tooltip>
+          </div>
+        </el-form-item>
+        <el-form-item label="新增按钮显隐条件定义">
+          <a
+            href="javascript:void(0);"
+            class="a-link link-oneLind"
+            @click="editRowShowScript('rowAddShow')"
+          >
+            <span>{{ row.rowAddShow }}</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="editRowShowScript('rowEditShow')"
+          >
+            <span>{{ row.rowEditShow }}</span>
+            <i class="el-icon-edit"></i>
+          </a>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div slot="footer" class="dialog-footer">
+      <el-button class="button-sty" icon="el-icon-close" @click="handleClose">
+        {{ i18nt("designer.hint.cancel") }}
+      </el-button>
+      <el-button
+        type="primary"
+        class="button-sty"
+        icon="el-icon-check"
+        @click="handleConfirm"
+      >
+        {{ i18nt("designer.hint.confirm") }}
+      </el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import { generateId } from "../../../../../../components/xform/utils/util";
+import Clipboard from "clipboard";
+
+export default {
+  name: "edit-tree-button-group-config-dialog",
+  mixins: [i18n, eventMixin],
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    row: {
+      type: Object,
+      required: true,
+    },
+  },
+  inject: ["getReportTemplate"],
+  data() {
+    return {
+      rowShowParams: ["dataId", "formCode", "tableParam"],
+    };
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible;
+      },
+      set(val) {
+        this.$emit("update:visible", val);
+      },
+    },
+    reportTemplate() {
+      return this.getReportTemplate();
+    },
+    rowAddAuthName() {
+      return this.getRowAddAuthName();
+    },
+    rowEditAuthName() {
+      return this.getRowEditAuthName();
+    },
+    rowAddAuthCode() {
+      return this.getRowAuthCode(this.rowAddAuthName);
+    },
+    rowEditAuthCode() {
+      return this.getRowAuthCode(this.rowEditAuthName);
+    },
+  },
+  watch: {
+    visible(val) {
+      if (val) {
+        this.ensureRowAuthNames();
+      }
+    },
+  },
+  methods: {
+    getRowAddAuthName() {
+      return this.row.rowAddAuthName ?? this.row.treeRowAddName;
+    },
+    getRowEditAuthName() {
+      return this.row.rowEditAuthName ?? this.row.treeRowEditName;
+    },
+    getRowAuthCode(authName) {
+      if (!authName || !this.reportTemplate?.formCode) {
+        return "";
+      }
+      return this.reportTemplate.formCode + ":" + authName;
+    },
+    createRowAuthName(type) {
+      return `row${type}` + generateId();
+    },
+    ensureRowAuthNames() {
+      if (!this.getRowAddAuthName()) {
+        this.$set(this.row, "rowAddAuthName", this.createRowAuthName("Add"));
+      }
+      if (!this.getRowEditAuthName()) {
+        this.$set(this.row, "rowEditAuthName", this.createRowAuthName("Edit"));
+      }
+    },
+    createRandomRowAddAuthName() {
+      this.$set(this.row, "rowAddAuthName", this.createRowAuthName("Add"));
+      this.$message.success("生成成功");
+    },
+    createRandomRowEditAuthName() {
+      this.$set(this.row, "rowEditAuthName", this.createRowAuthName("Edit"));
+      this.$message.success("生成成功");
+    },
+    editRowShowScript(eventName) {
+      this.editEventHandler(eventName, this.rowShowParams, {
+        customCode: () => this.row[eventName] || "",
+        callback: (code) => {
+          this.$set(this.row, eventName, code);
+        },
+      });
+    },
+    copyAuthCode(content, clickEvent) {
+      const clipboard = new Clipboard(clickEvent.target, {
+        text: () => content,
+      });
+      clipboard.on("success", () => {
+        this.$message.success("复制成功");
+        clipboard.destroy();
+      });
+      clipboard.on("error", () => {
+        this.$message.error("复制失败");
+        clipboard.destroy();
+      });
+      clipboard.onClick(clickEvent);
+    },
+    handleClose() {
+      this.dialogVisible = false;
+    },
+    handleConfirm() {
+      this.$emit("confirm", this.getRowConfigSnapshot());
+      this.dialogVisible = false;
+    },
+    getRowConfigSnapshot() {
+      return {
+        rowAddAuthName: this.row.rowAddAuthName,
+        rowEditAuthName: this.row.rowEditAuthName,
+        rowAddShow: this.row.rowAddShow,
+        rowEditShow: this.row.rowEditShow,
+      };
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+.edit-tree-button-group-form {
+  ::v-deep .el-form-item {
+    margin-bottom: 12px;
+  }
+  ::v-deep .el-form-item__label {
+    line-height: 28px;
+  }
+  ::v-deep .el-form-item__content {
+    line-height: 28px;
+  }
+  .auth-code-text {
+    word-break: break-all;
+    line-height: 1.5;
+  }
+}
+</style>