cloud-web-corejs-haier 1.0.43 → 1.0.45

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

@@ -1,11 +1,11 @@
 <template>
   <div>
-<!--    <el-form-item :label="i18nt('启用流程')">
-      <el-switch v-model="optionModel.wfEnabled"></el-switch>
-    </el-form-item>-->
     <el-form-item label-width="0">
       <el-divider class="custom-divider">{{ i18nt('designer.setting.columnSetting') }}</el-divider>
     </el-form-item>
+    <el-form-item :label="i18nt('隐藏导航')">
+      <el-switch v-model="optionModel.hideNav"></el-switch>
+    </el-form-item>
     <el-form-item :label="i18nt('designer.setting.colsOfGrid')"></el-form-item>
     <el-form-item label-width="0">
       <draggable tag="ul" class="draggable-box" :list="selectedWidget.panes"

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

@@ -0,0 +1,133 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">下拉按钮设置</el-divider>
+    </el-form-item>
+    <el-form-item label="按钮样式">
+      <el-select
+        v-model="optionModel.dropdownType"
+        placeholder="请选择按钮样式"
+      >
+        <el-option label="按钮" value="button"></el-option>
+        <el-option label="链接" value="link"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="下拉触发方式">
+      <el-select
+        v-model="optionModel.dropdownTrigger"
+        placeholder="请选择下拉触发方式"
+      >
+        <el-option label="点击" value="click"></el-option>
+        <el-option label="悬停" value="hover"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="下拉按钮选项"></el-form-item>
+        <li
+          v-for="(colItem, colIdx) in selectedWidget.widgetList"
+          :key="colIdx"
+          class="col-item"
+        >
+          <i class="el-icon-s-operation drag-option"></i>
+          <el-input
+            v-model="colItem.options.label"
+            class="cell-span-input"
+          ></el-input>
+          <el-button
+            circle
+            plain
+            size="mini"
+            type="button"
+            icon="el-icon-edit"
+            class="col-delete-button"
+            style="position: unset"
+            @click="openEditFormatConfigDialog(colItem, colIdx)"
+          ></el-button>
+          <el-button
+            circle
+            plain
+            size="mini"
+            type="danger"
+            @click="deleteCol(selectedWidget, colIdx)"
+            icon="el-icon-minus"
+            class="col-delete-button"
+            style="position: unset"
+          ></el-button>
+        </li>
+      </draggable>
+      <div>
+        <el-button
+          type="text"
+          @click="addNewCol(selectedWidget)"
+          icon="el-icon-circle-plus-outline"
+          class="add-option"
+        >
+          增加
+        </el-button>
+      </div>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import Draggable from "vuedraggable";
+import i18n from "../../../utils/i18n";
+import { deepClone, generateId } from "../../../utils/util";
+
+export default {
+  name: "dropdownFlag-editor",
+  mixins: [i18n],
+  components: {
+    Draggable,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  inject: ["openWidgetPropertyDialog"],
+  methods: {
+    deleteCol(gridWidget, colIdx) {
+      if (!!gridWidget && !!gridWidget.widgetList) {
+        gridWidget.widgetList.splice(colIdx, 1);
+      }
+      this.designer.emitHistoryChange();
+    },
+
+    addNewCol(gridWidget) {
+      let newGridCol = deepClone(
+        this.designer.getFieldWidgetByType("dropdown-item")
+      );
+      let tmpId = generateId();
+      newGridCol.id = "dropdown-item-" + tmpId;
+      newGridCol.options.name = "dropdownItem" + tmpId;
+      newGridCol.options.label = "dropdownItem" + tmpId;
+      gridWidget.widgetList.push(newGridCol);
+      this.designer.emitHistoryChange();
+    },
+    openEditFormatConfigDialog(fieldWidget, index) {
+      this.openWidgetPropertyDialog({
+        columnSelectedWidget: deepClone(fieldWidget),
+        callback: (columnOption) => {
+          fieldWidget.options = columnOption;
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+li.col-item {
+  list-style: none;
+
+  span.col-span-title {
+    display: inline-block;
+    font-size: 13px;
+    width: 120px;
+  }
+
+  .col-delete-button {
+    margin-left: 6px;
+  }
+}
+</style>

package/src/components/xform/form-designer/setting-panel/property-editor/event-handler/onClick-editor.vue

@@ -3,7 +3,7 @@
     <a
       href="javascript:void(0);"
       class="a-link link-oneLind"
-      @click="editEventHandler('onClick', eventParams)"
+      @click="openEventHandlerDialog"
     >
       <span>{{ optionModel.onClick }}</span>
       <i class="el-icon-edit"></i>
@@ -22,23 +22,31 @@ export default {
     designer: Object,
     selectedWidget: Object,
     optionModel: Object,
+    tableColumns: Array,
   },
   data() {
     return {
       // eventParams: ["id", "formCode"],
     };
   },
-  computed: {
-    eventParams() {
-      let eventParams = ["dataId", "formCode", "event"];
-      if (this.optionModel.rowFlag) {
-        eventParams.push("row", "index", "event");
+
+  methods: {
+    getEventParams() {
+      let eventParams = ["dataId", "formCode"];
+      if (this.tableColumns && this.tableColumns.length > 0) {
+        eventParams.push("row", "rowIndex", "event");
+      } else {
+        eventParams.push("event");
       }
       if (this.selectedWidget.type == "census") {
         eventParams.push("param");
       }
       return eventParams;
     },
+    openEventHandlerDialog() {
+      let eventParams = this.getEventParams();
+      this.editEventHandler("onClick", eventParams);
+    },
   },
 };
 </script>

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import-button-editor.vue

@@ -114,7 +114,7 @@ export default {
       eventParams: ["dataId", "formCode", "done"],
       showBdAttachSettingDialog: false,
       onBeforeImportParams: ["dataId", "formCode", "file", "resultData", "done"],
-      onConfirmImportParams: ["dataId", "formCode", "resultData", "file", "done"],
+      onConfirmImportParams: ["dataId", "formCode", "resultData", "file", "done", "close"],
       onSuccessImportParams: ["dataId", "formCode", "resultData", "file"],
     };
   },

package/src/components/xform/form-designer/setting-panel/property-editor/field-import-button/import2-button-editor.vue

@@ -77,7 +77,7 @@ export default {
       eventParams: ["dataId", "formCode", "done"],
       showBdAttachSettingDialog: false,
       onBeforeImportParams: ["dataId", "formCode", 'file', 'resultData', 'done'],
-      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done'],
+      onConfirmImportParams: ["dataId", "formCode", 'resultData', 'file', 'done', "close"],
       onSuccessImportParams: ["dataId", "formCode", 'resultData', 'file']
     };
   },

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

@@ -0,0 +1,48 @@
+<template>
+  <div>
+    <el-form-item label="Vue页面路径">
+      <el-input
+        v-model="optionModel.componentPath"
+        placeholder="如 @base/views/user/form/view/list 或 /user/form/view/list"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="页面高度">
+      <el-input
+        v-model="optionModel.componentHeight"
+        placeholder="如 500px，留空则自适应"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="页面传参" label-width="150px">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('componentConfig', params)"
+      >
+        <span>{{ optionModel.componentConfig }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../utils/i18n";
+import eventMixin from "../event-handler/eventMixin";
+
+export default {
+  name: "vue-page-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      params: ["dataId", "formCode"],
+    };
+  },
+};
+</script>
+
+<style scoped></style>

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

@@ -1,28 +1,29 @@
 <template>
-  <div v-show="false">
+  <div>
     <el-form-item label-width="0">
-      <el-divider class="custom-divider">{{i18nt('designer.setting.customLabelIcon')}}</el-divider>
+      <el-divider class="custom-divider">{{
+        i18nt("designer.setting.customLabelIcon")
+      }}</el-divider>
     </el-form-item>
     <el-form-item :label="i18nt('designer.setting.labelIconClass')">
-      <el-input type="text" v-model="optionModel.labelIconClass"></el-input>
+      <icon-picker v-model="optionModel.labelIconClass"></icon-picker>
     </el-form-item>
   </div>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
-
-  export default {
-    name: "labelIconClass-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-  }
+import i18n from "@base/components/xform/utils/i18n";
+import IconPicker from "@base/components/xform/icon-picker/index.vue";
+export default {
+  name: "labelIconClass-editor",
+  components: { IconPicker },
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -1,37 +1,37 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.labelIconPosition')" v-show="false">
+  <el-form-item :label="i18nt('designer.setting.labelIconPosition')">
     <el-select v-model="optionModel.labelIconPosition">
-      <el-option v-for="item in labelIconPosition" :key="item.value" :label="item.label"
-                 :value="item.value">
+      <el-option
+        v-for="item in labelIconPosition"
+        :key="item.value"
+        :label="item.label"
+        :value="item.value"
+      >
       </el-option>
     </el-select>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../components/xform/utils/i18n";
 
-  export default {
-    name: "labelIconPosition-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
-    },
-    data() {
-      return {
-        labelIconPosition: [
-          {label: 'front', value: 'front'},
-          {label: 'rear', value: 'rear'},
-        ],
-
-      }
-    },
-
-  }
+export default {
+  name: "labelIconPosition-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      labelIconPosition: [
+        { label: "前面", value: "front" },
+        { label: "后面", value: "rear" },
+      ],
+    };
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

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

@@ -1,23 +1,77 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.labelTooltip')" v-show="false">
-    <el-input type="text" v-model="optionModel.labelTooltip"></el-input>
-  </el-form-item>
+  <div>
+    <el-form-item :label="i18nt('designer.setting.labelTooltip')">
+      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
+        <span>{{ optionModel.labelTooltip }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-dialog
+      v-if="dialogVisible"
+      custom-class="dialog-style"
+      :title="i18nt('designer.setting.labelTooltip')"
+      :visible.sync="dialogVisible"
+      :show-close="true"
+      :append-to-body="true"
+      :modal="false"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :destroy-on-close="true"
+      width="520px"
+      v-dialog-drag
+    >
+      <el-input
+        type="textarea"
+        :rows="14"
+        class="label-tooltip-textarea"
+        v-model="labelTooltipValue"
+        clearable
+      ></el-input>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialogVisible = false" class="button-sty" icon="el-icon-close">
+          {{ i18nt("designer.hint.cancel") }}
+        </el-button>
+        <el-button type="primary" @click="submitDialog" class="button-sty" icon="el-icon-check">
+          {{ i18nt("designer.hint.confirm") }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../components/xform/utils/i18n";
 
-  export default {
-    name: "labelTooltip-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
+export default {
+  name: "labelTooltip-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      labelTooltipValue: "",
+    };
+  },
+  methods: {
+    openDialog() {
+      this.labelTooltipValue = this.optionModel.labelTooltip || "";
+      this.dialogVisible = true;
     },
-  }
+    submitDialog() {
+      const value = (this.labelTooltipValue || "").trim();
+      this.optionModel.labelTooltip = value || null;
+      this.dialogVisible = false;
+    },
+  },
+};
 </script>
 
 <style scoped>
-
+::v-deep .label-tooltip-textarea textarea {
+  min-height: 320px;
+}
 </style>

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

@@ -95,6 +95,8 @@ export default {
         "download-button",
         "copy_button",
         "tempStorage",
+        "dropdown",
+        "dropdown-item",
       ].includes(this.selectedWidget.type);
     },
     authCode() {

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

@@ -0,0 +1,29 @@
+<template>
+  <el-form-item :label="i18nt('隐藏查看附件按钮')">
+    <el-switch :value="hideViewButton" @change="handleChange"></el-switch>
+  </el-form-item>
+</template>
+
+<script>
+import i18n from "../../../../../components/xform/utils/i18n";
+
+export default {
+  name: "showViewButton-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  computed: {
+    hideViewButton() {
+      return this.optionModel.showViewButton === false;
+    },
+  },
+  methods: {
+    handleChange(hidden) {
+      this.$set(this.optionModel, "showViewButton", !hidden);
+    },
+  },
+};
+</script>

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

@@ -115,10 +115,11 @@ const COMMON_PROPERTIES = {
   'showRuleFlag': 'showRuleFlag-editor',
   'widgetShowRuleFlag': 'widgetShowRuleFlag-editor',
 
-  'dropdownMenuFlag': 'dropdown-menu-editor',
-  'dropdownItemFlag': 'dropdown-item-editor',
+  'dropdownFlag': 'dropdownFlag-editor',
+  // 'dropdownItemFlag': 'dropdown-item-editor',
 
   'oplogFlag': 'oplogFlag-editor',
+  vuePageFlag: "vue-page-editor",
   'ganttConfig': 'gantt-editor',
 
   //弹框
@@ -169,7 +170,8 @@ const COMMON_PROPERTIES = {
   "autoValueEnabled": "autoValueEnabled-editor",
   // "commonAttributeEnabled": "commonAttributeEnabled-editor"
   "colorClass": "colorClass-editor",
-  "downloadButtonFlag": "downloadButtonFlag-editor"
+  "downloadButtonFlag": "downloadButtonFlag-editor",
+  "showViewButton": "showViewButton-editor"
 }
 
 const ADVANCED_PROPERTIES = {
@@ -201,9 +203,9 @@ const ADVANCED_PROPERTIES = {
   'round': 'round-editor',
   'circle': 'circle-editor',
   'icon': 'icon-editor',
-  // 'labelIconClass': 'labelIconClass-editor',
-  // 'labelIconPosition': 'labelIconPosition-editor',
-  // 'labelTooltip': 'labelTooltip-editor',
+  labelIconClass: "labelIconClass-editor",
+  labelIconPosition: "labelIconPosition-editor",
+  labelTooltip: "labelTooltip-editor",
   // 'appendButton': 'appendButton-editor',
   // 'appendButtonDisabled': 'appendButtonDisabled-editor',
   // 'buttonIcon': 'buttonIcon-editor',

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

@@ -3261,6 +3261,7 @@ export const advancedFields = [
       labelWidth: null,
       labelHidden: !0,
       limit: null,
+      showViewButton: true,
       accessType: "1",
       entityTableCode: null,
       entityTableDesc: null,

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

@@ -15,8 +15,8 @@ import {
   columnFormatMap,
   traverseAllWidgetsNew,
 } from "../../../../components/xform/utils/util";
-import { applyColumnLabelIcon } from "../../../../components/xform/utils/tableColumnHelper";
 import { tableTreeMixins } from "../../../../mixins/tableTree/index.js";
+import { applyColumnLabelIcon } from "../../../../components/xform/utils/tableColumnHelper";
 
 let modules = {};
 const baseRefUtil = {
@@ -82,7 +82,7 @@ modules = {
       },
       vxeOption: {},
       requestAccess: null,
-      columnFormatMap: {
+      /* columnFormatMap: {
         editInput: "input",
         editNumber: "number",
         editDate: "date",
@@ -103,7 +103,7 @@ modules = {
         text: "text",
         checkbox: "checkbox",
         radio: "radio",
-      },
+      }, */
       dataTableConfig: {},
       widgets: [],
       editWidgets: [],
@@ -700,19 +700,13 @@ modules = {
           visible: t.show,
           slots: {},
         };
-        /* if (t.required) {
-          col.title = col.title;
-          col.titlePrefix = {
-            icon: "vxe-cell--required-icon"
-          }
-        } */
         applyColumnLabelIcon(col, t);
         if (t.treeNode) {
           col.treeNode = true;
         }
         if (t.children && t.children.length) {
           col.align = "center";
-          delete col.field;
+          // delete col.field;
           let childColumns = t.children.map((child) => {
             return createColumn(child, true);
           });
@@ -796,6 +790,7 @@ modules = {
           "status",
           "vabsearch",
           "date",
+          "textarea",
         ];
         if (widget && types.includes(widget.type)) {
           const func = (obj) => {
@@ -806,7 +801,7 @@ modules = {
             }
             if (fieldWidget && !fieldWidget.options.hidden) {
               let widgetType = fieldWidget.type;
-              if (["input", "number"].includes(widgetType)) {
+              if (["input", "number", "textarea"].includes(widgetType)) {
                 return value;
               }
               let widgetRef = this.getWidgetRefByTableParam(obj);
@@ -819,11 +814,7 @@ modules = {
               } else if ("radio" === widgetType) {
                 return this.getOptionLabel(fieldWidget, value);
               } else if ("status" === widgetType) {
-                let statusParam = fieldWidget.options.statusParam || [];
-                let statusItem = statusParam.find(
-                  (item) => item.value === value
-                );
-                return statusItem ? this.$t1(statusItem.label) : null;
+                return this.getStatusOptionLabel(fieldWidget, value);
               } else if ("vabsearch" === widgetType) {
                 let result = null;
                 let currentData = obj.row;
@@ -941,6 +932,18 @@ modules = {
         return resultList.join(",");
       }
     },
+    getStatusOptionLabel(fieldWidget, fieldModel) {
+      if (fieldModel === null || fieldModel === undefined) {
+        return null;
+      }
+      let statusParam = fieldWidget.options.statusParam || [];
+      let valueField = this.getOptionItemValueKey(fieldWidget);
+      let labelField = this.getOptionItemLabelKey(fieldWidget);
+      let statusItem = statusParam.find(
+        (item) => item[valueField] === fieldModel
+      );
+      return statusItem ? this.$t1(statusItem[labelField]) : null;
+    },
     findInArray: function (e, t) {
       if (!Array.isArray(e)) return -1;
       var i = -1;
@@ -2165,7 +2168,7 @@ modules = {
       let columnSelectedWidget = null;
       let columnEditFields = null;
 
-      let type = this.columnFormatMap[formatS];
+      let type = columnFormatMap[formatS];
 
       if (type) {
         columnSelectedWidget = this.$baseLodash.cloneDeep(