cloud-web-corejs 1.0.54-dev.78 → 1.0.54-dev.780

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

@@ -1,23 +1,60 @@
 <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">
-    <el-button icon="el-icon-plus" type="warning" class="el-button-tag" v-if="designState"></el-button>
-    <projectTagView v-else v-model="fieldModel" :readonly="field.options.readonly"></projectTagView>
+  <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"
+  >
+    <el-button
+      icon="el-icon-plus"
+      type="warning"
+      class="el-button-tag"
+      v-if="designState"
+    ></el-button>
+    <div v-else>
+      <el-tag
+        v-for="(tag, index) in fieldModel"
+        :key="index"
+        type="warning"
+        :disable-transitions="false"
+        :closable="!field.options.disabled && field.options.tabDeleteEnabled"
+        @close="deleteCallback(index)"
+      >
+        <el-tooltip
+          :enterable="false"
+          effect="dark"
+          :content="tag[field.options.tagLabelField]"
+          placement="bottom"
+        >
+          <span :style="tagStyle">{{ tag[field.options.tagLabelField] }}</span>
+        </el-tooltip>
+      </el-tag>
+      <el-button
+        icon="el-icon-plus"
+        type="warning"
+        class="el-button-tag"
+        @click="openProjectTagDialog"
+        v-if="!field.options.disabled"
+      ></el-button>
+    </div>
   </form-item-wrapper>
 </template>
 
 <script>
-import FormItemWrapper from './form-item-wrapper'
-import emitter from '../../../../../components/xform/utils/emitter'
+import FormItemWrapper from "./form-item-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";
-import projectTagView from "../../../../../components/projectTag/view.vue";
 
 export default {
   name: "project-tag-widget",
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -28,38 +65,37 @@ 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: {
-    projectTagView,
     FormItemWrapper,
   },
-  inject: ['refList', 'globalOptionData', 'globalModel', 'getFormConfig'],
+  inject: ["refList", "globalOptionData", "globalModel", "getFormConfig"],
   data() {
     return {
       oldFieldValue: [], //field组件change之前的值
       fieldModel: [],
       rules: [],
-    }
+    };
   },
   watch: {
     fieldModel(val) {
       this.handleChangeEvent(val);
-    }
+    },
   },
   computed: {
     formDataId() {
@@ -71,7 +107,18 @@ export default {
     },
     multi() {
       return this.limit !== 1;
-    }
+    },
+    tagStyle() {
+      let result = {};
+      let tagWidth = this.field.options.tagWidth;
+      if (tagWidth) {
+        result.width = tagWidth;
+        // result.overflow = "hidden";
+        result.textOverflow = "ellipsis";
+        // result.whiteSpace = "nowrap";
+      }
+      return result;
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -81,21 +128,20 @@ export default {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
 
+    this.initFieldModel();
+    this.registerToRefList();
+    this.initEventHandler();
+    this.buildFieldRules();
 
-    this.initFieldModel()
-    this.registerToRefList()
-    this.initEventHandler()
-    this.buildFieldRules()
-
-    this.handleOnCreated()
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
   methods: {
     loadDataDefaultHandle() {
@@ -103,29 +149,83 @@ export default {
       let reportTemplate = this.getFormRef().reportTemplate;
       let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
-      let scriptCode = this.field.options.formScriptCode || "getList"
+      let scriptCode = this.field.options.formScriptCode || "getList";
       if (!scriptCode) return;
-      let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
+      let accessParam = this.handleCustomEvent(this.field.options.formScriptParam);
       return this.formHttp({
         scriptCode: scriptCode,
-        data: {
-          formCode: formCode,
-          formVersion: reportTemplate.formVersion,
-          taBm: this.fieldKeyName,
-          data: {
-            ...accessParam,
-            id: dataId
-          }
-        },
-        callback: res => {
+        data: this.buildFormScriptData(reportTemplate, {
+          ...accessParam,
+          id: dataId,
+        }),
+        callback: (res) => {
           let rows = res.objx || [];
-          this.setValue(rows)
+          this.setValue(rows);
+          this.handleCustomEvent(this.field.options.formScriptSuccess, ["res"], [res]);
+        },
+      });
+    },
+    openProjectTagDialog() {
+      if (this.field.options.onClick) {
+        this.handleCustomEvent(this.field.options.onClick);
+        return;
+      }
+      let formCode = this.field.options.tagFormCode;
+      let tagLabelField = this.field.options.tagLabelField;
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let tagFormLabelField = this.field.options.tagFormLabelField;
+      let tagFormUniqueField = this.field.options.tagFormUniqueField;
+      /*let checkRows = this.fieldModel.map(item => {
+        return {
+          [tagFormUniqueField]: item[tagUniqueField] ?? null,
+          [tagFormLabelField]: item[tagLabelField] ?? null,
         }
+      })*/
+      let queryParam = null;
+      if (this.field.options.tagFormParam) {
+        queryParam = this.handleCustomEvent(this.field.options.tagFormParam);
+      }
+      this.getFormRef().openSearchDialog({
+        formCode,
+        queryParam,
+        // rows: checkRows,
+        multiple: true,
+        confirm: (rows) => {
+          if (!this.field.options.tagConfirmCallback) {
+            let tagFillConfig = this.field.options.tagFillConfig || [];
+            let items = rows.map((item) => {
+              let newData = {
+                [tagUniqueField]: item[tagFormUniqueField],
+                [tagLabelField]: item[tagFormLabelField],
+              };
+              tagFillConfig.forEach((item1) => {
+                newData[item1.targetField] = item[item1.sourceField];
+              });
+              return newData;
+            });
+            this.addTagData(items);
+          } else {
+            this.handleCustomEvent(
+              this.field.options.tagConfirmCallback,
+              ["rows"],
+              [rows]
+            );
+          }
+        },
       });
-
     },
-  }
-}
+    addTagData(rows) {
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let keys = this.fieldModel.map((item) => item[tagUniqueField]);
+      let items = rows.filter((item) => !keys.includes(item[tagUniqueField]));
+      this.fieldModel.push(...items);
+    },
+    deleteCallback(index) {
+      this.fieldModel.splice(index, 1);
+      this.handleCustomEvent(this.field.options.tagDeleteCallback);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -136,17 +236,19 @@ export default {
 }
 
 .hideUploadDiv {
-  ::v-deep div.el-upload--picture-card { /* 隐藏最后的图片上传按钮 */
+  ::v-deep div.el-upload--picture-card {
+    /* 隐藏最后的图片上传按钮 */
     display: none;
   }
 
-  ::v-deep div.el-upload--text { /* 隐藏最后的文件上传按钮 */
+  ::v-deep div.el-upload--text {
+    /* 隐藏最后的文件上传按钮 */
     display: none;
   }
 
-  ::v-deep div.el-upload__tip { /* 隐藏最后的文件上传按钮提示 */
+  ::v-deep div.el-upload__tip {
+    /* 隐藏最后的文件上传按钮提示 */
     display: none;
   }
 }
-
 </style>

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

@@ -2,20 +2,23 @@
   <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">
-    <el-radio-group ref="fieldEditor" v-model="fieldModel"
+    <el-radio-group ref="fieldEditor" v-model="fieldModel" v-show="!isReadMode"
                     :disabled="field.options.disabled" :size="field.options.size"
                     @change="handleChangeEvent">
       <template v-if="!!field.options.buttonStyle">
-        <el-radio-button v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio-button v-for="(item, index) in optionItems" :key="index" :label="item.value"
                          :disabled="item.disabled" :border="field.options.border"
                          :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio-button>
       </template>
       <template v-else>
-        <el-radio v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio v-for="(item, index) in optionItems" :key="index" :label="item[valueField]"
                   :disabled="item.disabled" :border="field.options.border"
-                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio>
+                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-radio>
       </template>
     </el-radio-group>
+    <template v-if="isReadMode">
+      <span class="readonly-mode-field">{{optionLabel}}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -67,7 +70,24 @@
       }
     },
     computed: {
-
+      labelField(){
+        return this.getOptionItemLabelKey();
+      },
+      valueField(){
+        return this.getOptionItemValueKey();
+      },
+      optionItems(){
+        return this.getOptionItems();
+      },
+      fieldModelLabel() {
+        // let fieldModel = this.fieldModel;
+        // let optionItems = this.field.options.optionItems;
+        // let valueField = this.valueField;
+        // let labelField = this.labelField;
+        // let optionItem = optionItems.find(item => item[valueField] === fieldModel)
+        // return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
+        return this.getOptionLabel();
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -78,8 +98,8 @@
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
       this.handleCreatedEnterEvent();
-      this.initOptionItems()
       this.initFieldModel()
+      this.initOptionItemsHandle()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()

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

@@ -0,0 +1,112 @@
+<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"
+  >
+    <el-button
+      v-show="isShow"
+      class="button-sty"
+      :type="field.options.type"
+      :size="field.options.size"
+      :plain="field.options.plain"
+      :round="field.options.round"
+      :circle="field.options.circle"
+      :icon="field.options.icon"
+      :disabled="!designState && field.options.disabled"
+      @click="clickHandle"
+    >
+      {{ getI18nLabel(field.options.label) }}
+    </el-button>
+  </static-content-wrapper>
+</template>
+
+<script>
+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: "save_submit_wf_button-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: {
+    StaticContentWrapper,
+  },
+  inject: {
+    getHasWf: {
+      default: () => () => false,
+    },
+  },
+  computed: {
+    isShow() {
+      if (this.designState) return true;
+      const formRef = this.getFormRef();
+      if (!formRef?.formConfig?.wfEnabled) return false;
+      if (this.isWfStarted(formRef)) return false;
+      return !this.field.options.hidden;
+    },
+  },
+  created() {
+    this.registerToRefList();
+    this.initEventHandler();
+    this.handleOnCreated();
+  },
+  mounted() {
+    this.handleOnMounted();
+  },
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+  methods: {
+    isWfStarted(formRef) {
+      const wfParam = formRef?.wfParam || {};
+      return !!(
+        wfParam.hasWf ||
+        formRef.hasWf ||
+        this.getHasWf() ||
+        wfParam.wfInfo?.procInstId
+      );
+    },
+    clickHandle() {
+      if (this.designState || this.field.options.disabled || !this.isShow) return;
+      this.saveAndSubmitWfHandle();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss";
+</style>

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

@@ -0,0 +1,146 @@
+<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() {
+      if (this.field.options.editorMode === "text") {
+        return false;
+      }
+      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/search_button-widget.vue

@@ -5,8 +5,8 @@
                           :index-of-parent-list="indexOfParentList"
                           :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                           :sub-form-row-id="subFormRowId">
-    <el-button class="button-sty" @click="handleButtonWidgetClick" icon="el-icon-search">
-      {{ field.options.label }}
+    <el-button class="button-sty" @click="handleButtonWidgetClick" icon="el-icon-search" :disabled="!designState &&field.options.disabled">
+      {{ getI18nLabel(field.options.label)}}
     </el-button>
   </static-content-wrapper>
 </template>