cloud-web-corejs 1.0.54-dev.511 → 1.0.54-dev.514

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.511",
+  "version": "1.0.54-dev.514",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",
@@ -25,7 +25,7 @@
     "copy-webpack-plugin": "5.1.2",
     "core-js": "^3.8.3",
     "dayjs": "^1.11.13",
-    "dhtmlx-gantt": "^7.1.13",
+    "dhtmlx-gantt": "^9.1.0",
     "element-ui": "^2.15.14",
     "esdk-obs-browserjs": "^3.25.6",
     "html2canvas": "^1.4.1",
@@ -125,6 +125,7 @@
     "src/components/baseInputNumber",
     "src/components/baseInputPrint",
     "src/components/baseTabs",
+    "src/components/base-textarea",
     "src/components/cnPrint",
     "src/components/code-editor",
     "src/components/confirmDialog",

package/src/components/base-textarea/index.vue

@@ -0,0 +1,104 @@
+<template>
+  <div class="bt-input">
+    <el-input v-bind="$attrs" v-on="$listeners" type="textarea">
+      ></el-input>
+    <el-tooltip effect="dark" placement="top" :disabled="!$attrs.value">
+      <div slot="content" v-html="handleNewlines($attrs.value)"></div>
+      <el-link icon="el-icon-question" @click="openDialog" :disabled="$attrs.disabled || $attrs.readonly" v-if="showIcon">
+      </el-link>
+    </el-tooltip>
+    <el-dialog
+      :title="title || $t1('内容')"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="false"
+      v-if="showDialog"
+      :visible.sync="showDialog"
+      :modal="false"
+      custom-class="dialog-style list-dialog dialog-checkbox pd_0"
+      width="1200px"
+      v-el-drag-dialog
+      v-el-dialog-center
+    >
+      <div class="cont" style="height: 450px">
+        <el-input
+          type="textarea"
+          v-model="content"
+          :rows="25"
+          :placeholder="$attrs.placeholder || $t1('请输入内容')"
+          resize="none"
+          :disabled="$attrs.disabled"
+          :readonly="$attrs.readonly"
+        >
+        </el-input>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" plain class="button-sty" @click="close">
+          <i class="el-icon-close el-icon"></i>
+          取 消
+        </el-button>
+        <el-button
+          type="primary"
+          @click="confirm"
+          class="button-sty"
+          v-if="!$attrs.disabled && !$attrs.readonly"
+        >
+          <i class="el-icon-check el-icon"></i>
+          确 定
+        </el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  name: "BaseTextarea",
+  components: {
+  },
+  props: {
+    title: {
+      type: String,
+      default: null,
+    },
+    showIcon: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  data() {
+    return {
+      content: null,
+      showDialog: false,
+    };
+  },
+  methods: {
+    openDialog() {
+      this.content = this.$attrs.value;
+      this.showDialog = true;
+    },
+    confirm() {
+      this.$emit("input", this.content);
+      this.showDialog = false;
+    },
+
+    close() {
+      this.showDialog = false;
+    },
+    handleNewlines(text) {
+      if (text && text.includes("\n")) {
+        return text.replaceAll("\n", "<br/>");
+      } else {
+        return text;
+      }
+    },
+  },
+};
+</script>
+<style scoped>
+  .el-link.el-link--default.is-disabled {
+    color: #606266;
+  }
+  ::v-deep.el-textarea {
+      width: calc(100% - 12px) !important;
+  }
+</style>

package/src/components/xform/form-designer/form-widget/components/gantt/index.vue

@@ -206,7 +206,8 @@ export default {
       //自适应甘特图的尺寸大小, 使得在不出现滚动条的情况下, 显示全部任务
       gantt.config.autosize = false;
       //只读模式
-      gantt.config.readonly = true;
+      // gantt.config.readonly = true;
+      gantt.config.readonly = false;
       //是否显示左侧树表格
       gantt.config.show_grid = true;
       // 设置表头高度
@@ -320,6 +321,20 @@ export default {
       // 销毁gantt实例   按需开启
       // gantt.destructor()
       // 初始化
+
+      // 启用插件
+      gantt.plugins({
+        tooltip: true,
+        marker: true,
+      });
+
+      // 配置工具提示模板
+      gantt.templates.tooltip_text = function (start, end, task) {
+        return `<b>任务名称:</b> ${task.text}<br/>
+            <b>开始时间:</b> ${gantt.templates.tooltip_date_format(start)}<br/>
+            <b>结束时间:</b> ${gantt.templates.tooltip_date_format(end)}`;
+      };
+
       this.ganttInstance = gantt.init(this.$refs.gantt);
       // 数据解析
       gantt.parse(this.tasks);

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

@@ -746,6 +746,7 @@ export default {
       gantt.parse(this.tasks);
     },
     initGantt() {
+      gantt.config.tooltip = true;
       // 配置国内日期格式（示例 1：YYYY-MM-DD）
       gantt.config.date_format = "%Y-%m-%d";
 
@@ -777,6 +778,7 @@ export default {
       this.initConfig();
       // 初始化
       gantt.init(this.$refs.gantt);
+
       /* *******重点******* */
       /*
       // 数据解析

package/src/index.js

@@ -161,6 +161,11 @@ Vue.component('scriptDescriptionButton', () => import('@base/components/scriptDe
 
 Vue.component('scriptTestButton', () => import('@base/components/scriptTest/button'));
 
+
+import baseTextarea from '@base/components/base-textarea/index.vue'
+
+Vue.component(baseTextarea.name, baseTextarea);
+
 import jsonImport from '@base/components/jsonImport/index.js';
 
 Vue.use(jsonImport);

package/src/layout/components/Sidebar/default.vue

@@ -401,12 +401,43 @@ export default {
     jumpOutLink(route) {
       let path = route.url || route.path;
       if (route.type == 4 && path) {
-        if (path.indexOf("token={token}") >= 0) {
+        let params = this.getCustomReqUrlAndCleanUrl(path);
+        let reqUrl = params.custom_req_url;
+        if (reqUrl) {
+          this.$http({
+            url: reqUrl,
+            method: `post`,
+            data: { thirdUrl: params.newUrl },
+            isLoading: true,
+            success: (res) => {
+              path = res.objx;
+            },
+          });
+        } else if (path.indexOf("token={token}") >= 0) {
           path = path.replace("token={token}", "token=" + getToken());
         }
         window.open(path);
       }
     },
+    getCustomReqUrlAndCleanUrl(url) {
+      // 直接使用正则表达式匹配
+      const match = url.match(/[?&]custom_req_url=([^&?#]+)/);
+      if (match) {
+        const customReqUrl = decodeURIComponent(match[1]);
+        // 移除匹配到的参数部分
+        const newUrl = url.replace(match[0], match[0].startsWith("?") ? "?" : "");
+
+        return {
+          custom_req_url: customReqUrl,
+          newUrl: newUrl.replace(/\?$/, "").replace(/\?&/, "?"),
+        };
+      }
+
+      return {
+        custom_req_url: "",
+        newUrl: url,
+      };
+    },
     changeModules(row, cRow) {
       if (!row.route) return;
       localStorage.setItem("currentMenuId", row.id);