cloud-web-corejs 1.0.54-dev.689 → 1.0.54-dev.690

package/package.json

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

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

@@ -1,35 +1,52 @@
 <template>
-  <static-content-wrapper :designer="designer" :field="field" :design-state="designState"
-                            :display-style="field.options.displayStyle"
-                            :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 class="ellipsis">
-    <a class="a-link" :class="widgetClass" @click="handleClick">
-      <template v-if="!!label"></template>
-      <el-tooltip :enterable="false" effect="dark" :content="label" placement="top"
-                  popper-class="tooltip-skin" :disabled="!label || field.options.disabled">
-        <span>
-          <i :class="field.options.prefixIcon" v-if="!!field.options.prefixIcon"></i>
-          <span v-if="!!showLabel">{{ showLabel }}</span>
-          <i :class="field.options.suffixIcon" v-if="!!field.options.suffixIcon"></i>
-        </span>
-      </el-tooltip>
-    </a>
+  <static-content-wrapper
+    :designer="designer"
+    :field="field"
+    :design-state="designState"
+    :display-style="field.options.displayStyle"
+    :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 class="ellipsis">
+      <a class="a-link" :class="widgetClass" @click="handleClick">
+        <el-tooltip
+          :enterable="false"
+          effect="dark"
+          :content="label"
+          placement="top"
+          popper-class="tooltip-skin"
+          :disabled="!label || field.options.disabled"
+        >
+          <span>
+            <i
+              :class="field.options.prefixIcon"
+              v-if="!!field.options.prefixIcon"
+            ></i>
+            <span v-if="!!label">{{ label }}</span>
+            <i
+              :class="field.options.suffixIcon"
+              v-if="!!field.options.suffixIcon"
+            ></i>
+          </span>
+        </el-tooltip>
+      </a>
     </div>
-    </static-content-wrapper>
+  </static-content-wrapper>
 </template>
 
 <script>
-import StaticContentWrapper from './static-content-wrapper'
-import emitter from '../../../../../components/xform/utils/emitter'
+import StaticContentWrapper from "./static-content-wrapper";
+import emitter from "../../../../../components/xform/utils/emitter";
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
 
 export default {
   name: "a-link-widget",
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -40,41 +57,39 @@ export default {
 
     designState: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
-    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-      type: String,
-      default: ''
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
-
   },
   components: {
     StaticContentWrapper,
   },
   computed: {
-    showLabel(){
-      return this.field.options.labelHidden? null: this.label;
-    },
     label() {
-      return this.field.options.isFormLabel ? this.getCurrentValue() : this.getI18nLabel(this.field.options.label);
+      return this.field.options.isFormLabel
+        ? this.getCurrentValue()
+        : this.getI18nLabel(this.field.options.label);
     },
     widgetClass() {
       let list = [];
-      let optionModel = this.field.options
+      let optionModel = this.field.options;
       if (optionModel.colorClass) list.push(optionModel.colorClass);
-      if (optionModel.underline) list.push('underLine');
-      if (optionModel.disabled) list.push('is-disabled');
-      return list
-    }
+      if (optionModel.underline) list.push("underLine");
+      if (optionModel.disabled) list.push("is-disabled");
+      return list;
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -83,31 +98,30 @@ export default {
   created() {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.registerToRefList()
-    this.initEventHandler()
+    this.registerToRefList();
+    this.initEventHandler();
 
-    this.handleOnCreated()
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
 
   methods: {
     handleClick(e) {
-      if(this.field.options.disabled)return
+      if (this.field.options.disabled) return;
       this.handleButtonWidgetClick(e);
       if (!this.designState && this.field.options.href) {
         window.open(this.field.options.href);
       }
-    }
-  }
-
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -115,5 +129,4 @@ export default {
 a.is-disabled {
   cursor: not-allowed;
 }
-
 </style>

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

@@ -1,143 +1,143 @@
-<template>
-  <form-item-wrapper
-    :designer="designer"
-    :field="field"
-    :rules="rules"
-    :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 v-if="designState" class="script-input-design-placeholder">
-      {{ getI18nLabel(field.options.placeholder) || "脚本输入框" }}
-      <span class="script-input-mode">({{ editorMode }})</span>
-    </div>
-    <template v-else-if="isReadMode">
-      <pre class="readonly-mode-field script-input-readonly">{{ fieldModel }}</pre>
-    </template>
-    <code-editor
-      v-else
-      v-model="fieldModel"
-      :mode="editorMode"
-      :readonly="field.options.readonly || field.options.disabled"
-      :height="editorHeight"
-      :min-lines="editorMinLines"
-      :max-lines="editorMaxLines"
-      :user-worker="userWorker"
-      :resize="!field.options.disabled && !field.options.readonly"
-      @input="onEditorInput"
-    />
-  </form-item-wrapper>
-</template>
-
-<script>
-import FormItemWrapper from "./form-item-wrapper";
-import emitter from "../../../utils/emitter";
-import i18n from "../../../utils/i18n";
-import fieldMixin from "./fieldMixin";
-
-export default {
-  name: "script-input-widget",
-  componentName: "FieldWidget",
-  mixins: [emitter, fieldMixin, i18n],
-  props: {
-    field: Object,
-    parentWidget: Object,
-    parentList: Array,
-    indexOfParentList: Number,
-    designer: Object,
-    designState: {
-      type: Boolean,
-      default: false,
-    },
-    subFormRowIndex: {
-      type: Number,
-      default: -1,
-    },
-    subFormColIndex: {
-      type: Number,
-      default: -1,
-    },
-    subFormRowId: {
-      type: String,
-      default: "",
-    },
-  },
-  components: {
-    FormItemWrapper,
-  },
-  inject: ["refList", "globalOptionData", "globalModel"],
-  data() {
-    return {
-      oldFieldValue: null,
-      fieldModel: null,
-      rules: [],
-    };
-  },
-  computed: {
-    editorMode() {
-      return this.field.options.editorMode || "javascript";
-    },
-    editorHeight() {
-      return this.field.options.editorHeight || "200px";
-    },
-    editorMinLines() {
-      return this.field.options.editorMinLines || 8;
-    },
-    editorMaxLines() {
-      return this.field.options.editorMaxLines || 30;
-    },
-    userWorker() {
-      return this.field.options.userWorker === true;
-    },
-  },
-  created() {
-    this.initFieldModel();
-    this.registerToRefList();
-    this.initEventHandler();
-    this.buildFieldRules();
-    this.handleOnCreated();
-  },
-  mounted() {
-    this.handleOnMounted();
-  },
-  beforeDestroy() {
-    this.unregisterFromRefList();
-  },
-  methods: {
-    onEditorInput(val) {
-      this.handleInputCustomEvent(val);
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import "~@/styles/global.scss";
-
-.script-input-design-placeholder {
-  min-height: 120px;
-  padding: 12px;
-  border: 1px dashed #c0c4cc;
-  border-radius: 4px;
-  color: #909399;
-  font-size: 13px;
-  background: #fafafa;
-}
-
-.script-input-mode {
-  margin-left: 6px;
-  color: #336699;
-}
-
-.script-input-readonly {
-  margin: 0;
-  white-space: pre-wrap;
-  word-break: break-all;
-  font-family: Consolas, Monaco, monospace;
-  font-size: 12px;
-}
-</style>
+<template>
+  <form-item-wrapper
+    :designer="designer"
+    :field="field"
+    :rules="rules"
+    :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 v-if="designState" class="script-input-design-placeholder">
+      {{ getI18nLabel(field.options.placeholder) || "脚本输入框" }}
+      <span class="script-input-mode">({{ editorMode }})</span>
+    </div>
+    <template v-else-if="isReadMode">
+      <pre class="readonly-mode-field script-input-readonly">{{ fieldModel }}</pre>
+    </template>
+    <code-editor
+      v-else
+      v-model="fieldModel"
+      :mode="editorMode"
+      :readonly="field.options.readonly || field.options.disabled"
+      :height="editorHeight"
+      :min-lines="editorMinLines"
+      :max-lines="editorMaxLines"
+      :user-worker="userWorker"
+      :resize="!field.options.disabled && !field.options.readonly"
+      @input="onEditorInput"
+    />
+  </form-item-wrapper>
+</template>
+
+<script>
+import FormItemWrapper from "./form-item-wrapper";
+import emitter from "../../../utils/emitter";
+import i18n from "../../../utils/i18n";
+import fieldMixin from "./fieldMixin";
+
+export default {
+  name: "script-input-widget",
+  componentName: "FieldWidget",
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+    designState: {
+      type: Boolean,
+      default: false,
+    },
+    subFormRowIndex: {
+      type: Number,
+      default: -1,
+    },
+    subFormColIndex: {
+      type: Number,
+      default: -1,
+    },
+    subFormRowId: {
+      type: String,
+      default: "",
+    },
+  },
+  components: {
+    FormItemWrapper,
+  },
+  inject: ["refList", "globalOptionData", "globalModel"],
+  data() {
+    return {
+      oldFieldValue: null,
+      fieldModel: null,
+      rules: [],
+    };
+  },
+  computed: {
+    editorMode() {
+      return this.field.options.editorMode || "javascript";
+    },
+    editorHeight() {
+      return this.field.options.editorHeight || "200px";
+    },
+    editorMinLines() {
+      return this.field.options.editorMinLines || 8;
+    },
+    editorMaxLines() {
+      return this.field.options.editorMaxLines || 30;
+    },
+    userWorker() {
+      return this.field.options.userWorker === true;
+    },
+  },
+  created() {
+    this.initFieldModel();
+    this.registerToRefList();
+    this.initEventHandler();
+    this.buildFieldRules();
+    this.handleOnCreated();
+  },
+  mounted() {
+    this.handleOnMounted();
+  },
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+  methods: {
+    onEditorInput(val) {
+      this.handleInputCustomEvent(val);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss";
+
+.script-input-design-placeholder {
+  min-height: 120px;
+  padding: 12px;
+  border: 1px dashed #c0c4cc;
+  border-radius: 4px;
+  color: #909399;
+  font-size: 13px;
+  background: #fafafa;
+}
+
+.script-input-mode {
+  margin-left: 6px;
+  color: #336699;
+}
+
+.script-input-readonly {
+  margin: 0;
+  white-space: pre-wrap;
+  word-break: break-all;
+  font-family: Consolas, Monaco, monospace;
+  font-size: 12px;
+}
+</style>

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

@@ -87,6 +87,10 @@ export default {
         result = result && !hasWf;
       }*/
       if(!this.designState){
+        // 表格行内嵌组件不走表单字段 dispermissions 校验
+        if (this.$parent?.tableParam) {
+          return result;
+        }
         let authCode = this.$parent.getAuthCode ? this.$parent.getAuthCode() : null
         if(authCode){
           let dispermissions = this.$store.getters.dispermissions;

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

@@ -1,54 +1,54 @@
-<template>
-  <div>
-    <el-form-item label="编辑器语言">
-      <el-select v-model="optionModel.editorMode">
-        <el-option value="javascript" label="JavaScript"></el-option>
-        <el-option value="java" label="Java"></el-option>
-        <el-option value="json" label="JSON"></el-option>
-      </el-select>
-    </el-form-item>
-    <el-form-item label="编辑器高度">
-      <el-input
-        v-model="optionModel.editorHeight"
-        placeholder="如 200px"
-      ></el-input>
-    </el-form-item>
-    <el-form-item label="最小行数">
-      <el-input-number
-        v-model="optionModel.editorMinLines"
-        :min="3"
-        :max="100"
-        controls-position="right"
-        style="width: 100%"
-      ></el-input-number>
-    </el-form-item>
-    <el-form-item label="最大行数">
-      <el-input-number
-        v-model="optionModel.editorMaxLines"
-        :min="3"
-        :max="200"
-        controls-position="right"
-        style="width: 100%"
-      ></el-input-number>
-    </el-form-item>
-    <el-form-item label="语法检查">
-      <el-switch v-model="optionModel.userWorker"></el-switch>
-    </el-form-item>
-  </div>
-</template>
-
-<script>
-import i18n from "../../../../utils/i18n";
-
-export default {
-  name: "script-input-editor",
-  mixins: [i18n],
-  props: {
-    designer: Object,
-    selectedWidget: Object,
-    optionModel: Object,
-  },
-};
-</script>
-
-<style scoped></style>
+<template>
+  <div>
+    <el-form-item label="编辑器语言">
+      <el-select v-model="optionModel.editorMode">
+        <el-option value="javascript" label="JavaScript"></el-option>
+        <el-option value="java" label="Java"></el-option>
+        <el-option value="json" label="JSON"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="编辑器高度">
+      <el-input
+        v-model="optionModel.editorHeight"
+        placeholder="如 200px"
+      ></el-input>
+    </el-form-item>
+    <el-form-item label="最小行数">
+      <el-input-number
+        v-model="optionModel.editorMinLines"
+        :min="3"
+        :max="100"
+        controls-position="right"
+        style="width: 100%"
+      ></el-input-number>
+    </el-form-item>
+    <el-form-item label="最大行数">
+      <el-input-number
+        v-model="optionModel.editorMaxLines"
+        :min="3"
+        :max="200"
+        controls-position="right"
+        style="width: 100%"
+      ></el-input-number>
+    </el-form-item>
+    <el-form-item label="语法检查">
+      <el-switch v-model="optionModel.userWorker"></el-switch>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../utils/i18n";
+
+export default {
+  name: "script-input-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+};
+</script>
+
+<style scoped></style>

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

@@ -158,13 +158,13 @@
         <component
           v-else
           :is="getColumnWidgetName(obj.column.params.widget)"
-          :field="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id]"
+          :field="getTableColumnWidget(obj)"
           :form-model="globalModel.formModel"
           :designer="null"
           :key="
             obj.rowIndex +
             '-' +
-            fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].id
+            (getTableColumnWidget(obj) && getTableColumnWidget(obj).id)
           "
           :parent-widget="widget"
           :columnConfig="obj.column.params.columnConfig"

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

@@ -242,8 +242,19 @@ modules = {
       return widget.options.labelKey || "label";
     },
     getTableColumnWidget(obj) {
-      let item = this.fieldSchemaMap[obj.row._X_ROW_KEY];
-      return item ? item[obj.column.params?.widget.id] : null;
+      const rowKey = obj?.row?._X_ROW_KEY;
+      const widget = obj?.column?.params?.widget;
+      if (!rowKey || !widget?.id) {
+        return null;
+      }
+      let rowSchema = this.fieldSchemaMap[rowKey];
+      if (!rowSchema) {
+        rowSchema = this.createRowFieldSchemaMap();
+        this.$set(this.fieldSchemaMap, rowKey, rowSchema);
+      } else if (!rowSchema[widget.id]) {
+        this.$set(rowSchema, widget.id, this.cloneFieldSchema(widget));
+      }
+      return rowSchema[widget.id] || null;
     },
     isShowColumnStatusWidget(obj, item) {
       let widget = this.getTableColumnWidget(obj);
@@ -3764,38 +3775,70 @@ modules = {
         return
       }*/
 
-      let rows = this.formModel[this.fieldKeyName];
       let rowIdData = this.rowIdData;
       let rowLength = this.rowIdData.length;
       // this.fieldSchemaData.splice(0, this.fieldSchemaData.length)  //清除数组必须用splice，length=0不会响应式更新！！
       // if(initFlag)this.fieldSchemaMap = {};
       if (rowLength > 0) {
-        let target = this.getGridTable();
-        if (!target) return;
-        let { fullColumn } = target.getTableColumn();
-        let allWidgets = [];
-        let fieldSchemaMap = {};
-        let fieldSchemaMap0 = this.fieldSchemaMap;
-        for (let i = 0; i < rowLength; i++) {
-          let rowId = rowIdData[i];
-          let fieldSchemas = [];
-          let fieldSchemaMap2 = null;
-          if (initFlag) {
-            fieldSchemaMap2 = this.createRowFieldSchemaMap();
-          } else {
-            let fieldSchemaMap01 = fieldSchemaMap0[rowId];
-            fieldSchemaMap2 = fieldSchemaMap01
-              ? this.$baseLodash.cloneDeep(fieldSchemaMap01)
-              : this.createRowFieldSchemaMap();
+        const build = () => {
+          if (!this.getTableFullColumns().length) {
+            return false;
+          }
+          let fieldSchemaMap = {};
+          let fieldSchemaMap0 = this.fieldSchemaMap;
+          for (let i = 0; i < rowLength; i++) {
+            let rowId = rowIdData[i];
+            let fieldSchemaMap2 = null;
+            if (initFlag) {
+              fieldSchemaMap2 = this.createRowFieldSchemaMap();
+            } else {
+              let fieldSchemaMap01 = fieldSchemaMap0[rowId];
+              fieldSchemaMap2 = fieldSchemaMap01
+                ? this.$baseLodash.cloneDeep(fieldSchemaMap01)
+                : this.createRowFieldSchemaMap();
+            }
+            fieldSchemaMap[rowId] = fieldSchemaMap2;
           }
-          fieldSchemaMap[rowId] = fieldSchemaMap2;
+          this.fieldSchemaMap = fieldSchemaMap;
+          return true;
+        };
+        if (!build()) {
+          this.$nextTick(() => {
+            if (this.rowIdData.length) {
+              this.initFieldSchemaData(initFlag);
+            }
+          });
         }
-        this.fieldSchemaMap = fieldSchemaMap;
       }
     },
-    createRowFieldSchemaMap() {
+    getTableFullColumns() {
       let target = this.getGridTable();
-      let { fullColumn } = target.getTableColumn();
+      if (target?.getTableColumn) {
+        let { fullColumn } = target.getTableColumn();
+        if (fullColumn?.length) {
+          return fullColumn;
+        }
+      }
+      return this.vxeOption?.columns || [];
+    },
+    collectLeafTableColumns(columns, result = []) {
+      if (!Array.isArray(columns)) {
+        return result;
+      }
+      columns.forEach((column) => {
+        if (column?.children?.length) {
+          this.collectLeafTableColumns(column.children, result);
+        } else {
+          result.push(column);
+        }
+      });
+      return result;
+    },
+    createRowFieldSchemaMap() {
+      let fullColumn = this.collectLeafTableColumns(
+        this.getTableFullColumns(),
+        []
+      );
 
       let fieldSchemaMap2 = {};
       fullColumn.forEach((column) => {

package/src/components/xform/form-render/indexMixin.js

@@ -566,6 +566,24 @@ modules = {
         }
       });
     },
+    normalizeActionColumnWidget(fieldWidget, formatS) {
+      if (!fieldWidget?.options) return;
+      if (formatS === "editButton") {
+        fieldWidget.options.prefixIcon =
+          fieldWidget.options.prefixIcon || "el-icon-edit";
+        fieldWidget.options.label = fieldWidget.options.label || "查看";
+        if (fieldWidget.options.labelHidden === undefined) {
+          fieldWidget.options.labelHidden = true;
+        }
+      } else if (formatS === "editDelete") {
+        fieldWidget.options.prefixIcon =
+          fieldWidget.options.prefixIcon || "el-icon-delete";
+        fieldWidget.options.label = fieldWidget.options.label || "删除";
+        if (fieldWidget.options.labelHidden === undefined) {
+          fieldWidget.options.labelHidden = true;
+        }
+      }
+    },
     handleTableColumnWidget(widget) {
       //修复data-table旧数据表格列widget与editWidget为空的问题
       if (
@@ -590,7 +608,10 @@ modules = {
             } else {
               applyColumnMetaToFieldWidget(t.widget, t, false);
             }
-            if (t.widget) t.widget.columnType = t.formatS;
+            if (t.widget) {
+              t.widget.columnType = t.formatS;
+              this.normalizeActionColumnWidget(t.widget, t.formatS);
+            }
           }
           let type2 = columnFormatMap[t.editFormatS];
           if (type2) {