cloud-web-corejs 1.0.54-dev.695 → 1.0.54-dev.696

package/package.json

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

package/src/components/jsonImport/exportUtil.js

@@ -0,0 +1,102 @@
+function isNull(val) {
+  return val == null || val === "" || val === undefined;
+}
+
+export function formatJsonContent(content) {
+  if (isNull(content)) return "";
+  if (typeof content === "object") {
+    try {
+      return JSON.stringify(content, null, 2);
+    } catch (e) {
+      return String(content);
+    }
+  }
+  const text = String(content).trim();
+  if (!text) return "";
+  try {
+    return JSON.stringify(JSON.parse(text), null, 2);
+  } catch (e) {
+    return text;
+  }
+}
+
+function parseExportContent(content) {
+  if (!content) {
+    return { list: [], isArray: true };
+  }
+  try {
+    const parsed = JSON.parse(content);
+    if (Array.isArray(parsed)) {
+      return { list: parsed, isArray: true };
+    }
+    return { list: [parsed], isArray: false };
+  } catch (e) {
+    return { list: [], isArray: true, invalid: true };
+  }
+}
+
+export function getExportExtraConfig(url, options = {}) {
+  if (options.extraExport) {
+    return options.extraExport;
+  }
+  if (!url) return null;
+  if (url.includes("/form_develop/exportFormScript")) {
+    return {
+      field: "script",
+      getExtraFileName(item) {
+        const scriptCode = item.scriptCode || "script";
+        const formCode = item.formCode;
+        return formCode
+          ? `${scriptCode} - ${formCode} - item(script)`
+          : `${scriptCode} - item(script)`;
+      },
+    };
+  }
+  if (url.includes("/form_develop/exportFormTemplate")) {
+    return {
+      field: "formViewContent",
+      getExtraFileName(item) {
+        return `${item.formCode || "form"} - item(form)`;
+      },
+    };
+  }
+  return null;
+}
+
+export function processExportContent(content, extraConfig) {
+  if (!extraConfig) {
+    return { mainContent: content, extraFiles: [] };
+  }
+
+  const { field, getExtraFileName } = extraConfig;
+  const { list, isArray, invalid } = parseExportContent(content);
+
+  if (invalid || !list.length) {
+    return { mainContent: content, extraFiles: [] };
+  }
+
+  const extraFiles = [];
+  const usedNames = {};
+
+  list.forEach((item, index) => {
+    if (!item || isNull(item[field])) return;
+
+    const formatted = formatJsonContent(item[field]);
+    item[field] = formatted;
+
+    let fileName = getExtraFileName(item, index);
+    if (!fileName) return;
+
+    if (usedNames[fileName]) {
+      usedNames[fileName] += 1;
+      fileName = `${fileName}_${usedNames[fileName]}`;
+    } else {
+      usedNames[fileName] = 1;
+    }
+
+    extraFiles.push({ fileName, content: formatted });
+  });
+
+  const mainContent = JSON.stringify(isArray ? list : list[0], null, 2);
+  return { mainContent, extraFiles };
+}

package/src/components/jsonImport/index.js

@@ -4,6 +4,10 @@ import excelImport from "./index.vue";
 import exportDialog from "./exportDialog.vue";
 import { getBdEnv } from "@base/api/user";
 import { encrypt, decrypt } from "@base/utils/aes";
+import {
+  getExportExtraConfig,
+  processExportContent,
+} from "./exportUtil";
 
 import { getToken } from "../../utils/auth";
 
@@ -107,14 +111,19 @@ moudule.install = function (Vue) {
                 .replaceAll(" ", "");
               fileName = options.title + "(" + timeStr + ")";
             }
-            /* if (options.plaintext) {
-              try {
-                content = JSON.stringify(JSON.parse(content), null, 2);
-              } catch (e) {
-                // content is not valid JSON, keep original
-              }
-            } */
-            downloadTxt(fileName, content);
+            const extraConfig = getExportExtraConfig(options.url, options);
+            if (extraConfig) {
+              const processed = processExportContent(content, extraConfig);
+              content = processed.mainContent;
+              const extraFiles = resolveExtraFileNames(
+                processed.extraFiles,
+                options.fileName
+              );
+              downloadTxt(fileName, content);
+              downloadExtraFiles(extraFiles);
+            } else {
+              downloadTxt(fileName, content);
+            }
           } else {
             this.$baseAlert(this.$t1("不存在需要导出的数据"));
           }
@@ -152,6 +161,28 @@ moudule.install = function (Vue) {
   };
 };
 
+function resolveExtraFileNames(extraFiles, mainFileName) {
+  if (!extraFiles || !extraFiles.length) return [];
+  return extraFiles.map((file) => {
+    if (mainFileName && file.fileName === mainFileName) {
+      return {
+        ...file,
+        fileName: `${file.fileName}-content`,
+      };
+    }
+    return file;
+  });
+}
+
+function downloadExtraFiles(extraFiles) {
+  if (!extraFiles || !extraFiles.length) return;
+  extraFiles.forEach((file, index) => {
+    setTimeout(() => {
+      downloadTxt(file.fileName, file.content);
+    }, (index + 1) * 300);
+  });
+}
+
 function downloadTxt(fileName, content) {
   // 创建Blob对象
   const blob = new Blob([content], { type: "text/plain;charset=utf-8" });

package/src/components/wf/wf.js

@@ -1743,7 +1743,10 @@ wfStartMixin = {
         (this.wfDefItems = wfDefItems);
       this.$set(this.wfStartForm, "modelId", wfDefItems[0].modelId);
       if (wfDefItems.length == 1) {
-        if (settingConfig.withoutConfrimByOneWf === true) {
+        if (
+          settingConfig.withoutConfrimByOneWf === true ||
+          (this.option && this.option.skipStartConfirm)
+        ) {
           this.startSubmit();
         } else {
           let wfStartOperateName =

package/src/components/wf/wfUtil.js

@@ -289,3 +289,4 @@ function appendPrevChildDom(parentDom, newDom) {
 }
 
 export const initWf = f;
+export { openStartWfDialog };

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/setting-panel/property-editor/name-editor.vue

@@ -94,6 +94,7 @@ export default {
         "print-detail-button",
         "download-button",
         "copy_button",
+        "save_submit_wf_button",
         "tempStorage",
         "dropdown",
         "dropdown-item",

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

@@ -3976,6 +3976,45 @@ export const businessFields = [
       tabDeleteEnabled: true,
     },
   },
+  {
+    type: "save_submit_wf_button",
+    targetType: "button",
+    icon: "button",
+    commonFlag: !0,
+    columnFlag: true,
+    formItemFlag: !1,
+    options: {
+      name: "",
+      label: "保存并提交流程",
+      columnWidth: "200px",
+      size: "",
+      displayStyle: "block",
+      disabled: !1,
+      hidden: !1,
+      type: "success",
+      plain: !1,
+      round: !1,
+      circle: !1,
+      icon: "el-icon-video-play",
+      customClass: "",
+      onCreated: "",
+      onMounted: "",
+      onClick: "this.saveAndSubmitWfHandle();",
+      accessType: "1",
+      saveSubmitWfButton: true,
+      clickBindEvent: null,
+      onBeforeClickButton: null,
+      searchDialogConfig: {
+        ...defaultSearchDialogConfig,
+      },
+      ...defaultWfConfig,
+      ...defaultWidgetShowRuleConfig,
+      hiddenByWf: true,
+      showRuleFlag: 1,
+      showRuleEnabled: 1,
+      showRules: [],
+    },
+  },
   {
     type: "copy_button",
     icon: "button",

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

@@ -653,6 +653,10 @@ modules = {
 
         //处理组件显隐规则
         this.handleWidgetShowRule(widget);
+        if (wfParam.hasWf && widget?.options?.saveSubmitWfButton) {
+          widget.options.hidden = true;
+          return;
+        }
         if (wfParam.hasWf) {
           if (!widgetEditOnWf) {
             //有流程，且不匹配流程节点可编辑表单设置信息
@@ -697,6 +701,10 @@ modules = {
       const processWidget = (widget) => {
         if (!widget) return;
         this.handleWidgetShowRule(widget);
+        if (wfParam.hasWf && widget?.options?.saveSubmitWfButton) {
+          widget.options.hidden = true;
+          return;
+        }
         if (!wfParam.hasWf || widgetEditOnWf) return;
         this.hanldeWfWidgetNew1(widget);
         if (wfInfo.taskStep === "9999") {
@@ -828,6 +836,13 @@ modules = {
     },
     hanldeWfWidgetNew1(widget) {
       if (!widget) return;
+      if (widget?.options?.saveSubmitWfButton) {
+        let wfParam = this.wfParam || {};
+        if (wfParam.hasWf) {
+          widget.options.hidden = true;
+        }
+        return;
+      }
       let flag =
         widget.columnType &&
         ["editDelete", "removeTreeRow"].includes(widget.columnType);
@@ -877,7 +892,7 @@ modules = {
 
       let handleWfConfigData = (widget, columnOptions) => {
         let options = widget?.options || columnOptions;
-        if (!options || !options.wfEdit) return;
+        if (!options || !options.wfEdit || options.saveSubmitWfButton) return;
         let wfConfigData = options.wfConfigData || [];
         let flag = false;
         wfConfigData.forEach((item) => {
@@ -1154,7 +1169,7 @@ modules = {
 
       let handleWfConfigData = (widget, columnOptions) => {
         let options = widget?.options || columnOptions;
-        if (!options || !options.wfEdit) return;
+        if (!options || !options.wfEdit || options.saveSubmitWfButton) return;
         let wfConfigData = options.wfConfigData || [];
         let flag = false;
         wfConfigData.forEach((item) => {

package/src/components/xform/lang/zh-CN.js

@@ -76,6 +76,7 @@ export default {
       "print-button": "导出/打印(列表)",
       "print-detail-button": "导出/打印(详情)",
       copy_button: "复制按钮",
+      save_submit_wf_button: "保存并提交流程",
       "rich-editor": "富文本",
       cascader: "级联选择",
       "area-select": "地区选择",

package/src/components/xform/mixins/defaultHandle.js

@@ -1,6 +1,7 @@
 import moment from "moment";
 import { saveUserLog } from "@base/api/user";
 import settingConfig from "@/settings";
+import { openStartWfDialog } from "../../../components/wf/wfUtil";
 
 let modules = {};
 modules = {
@@ -109,6 +110,46 @@ modules = {
         });
       }
     },
+    saveAndSubmitWfHandle(option) {
+      let formRef = this.getFormRef ? this.getFormRef() : this;
+      let formConfig = formRef.formConfig;
+      let reportTemplate = formRef.reportTemplate;
+      let wfParam = formRef.wfParam || {};
+
+      if (!formConfig?.wfEnabled) return;
+      if (
+        formRef.hasWf ||
+        wfParam.hasWf ||
+        wfParam.wfInfo?.procInstId
+      ) {
+        return;
+      }
+
+      let confirmText =
+        option?.confirmText ||
+        option?.config?.confirmText ||
+        this.$t1("您确定要保存并提交流程吗？");
+
+      this.saveDefaultHandle({
+        ...option,
+        config: {
+          ...option?.config,
+          successMsg: option?.config?.successMsg ?? true,
+          isConfirm: option?.config?.isConfirm ?? true,
+          confirmText: option?.config?.confirmText || confirmText,
+          success: (res) => {
+            openStartWfDialog(formRef, {
+              objId: res.objx,
+              wfCode: reportTemplate.objTypeCode,
+              formCode: reportTemplate.formCode,
+              serviceId: reportTemplate.serviceName,
+              skipStartConfirm: true,
+            });
+            option?.config?.success && option.config.success(res);
+          },
+        },
+      });
+    },
     saveDefaultHandle(option) {
       let formRef = this.getFormRef ? this.getFormRef() : this;
       let formConfig = formRef.formConfig;

package/src/views/bd/setting/form_script/mixins/list.js

@@ -286,7 +286,9 @@ modules = {
         data: [row.id],
         url: USER_PREFIX + "/form_develop/exportFormScript",
         plaintext: 1,
-        fileName: row.scriptCode + "(script)",
+        fileName: row.formCode
+          ? `${row.scriptCode} - ${row.formCode}(script)`
+          : `${row.scriptCode}(script)`,
         abcEnabled: true,
       });
     },