cloud-web-corejs 1.0.54-dev.451 → 1.0.54-dev.453

package/package.json

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

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

@@ -7,21 +7,12 @@
       <el-switch v-model="optionModel.hiddenByWf" @change="changeHiddenByWf"></el-switch>
     </el-form-item>-->
     <el-form-item :label="i18nt('特定流程节点设置')">
-      <el-switch
-        v-model="optionModel.wfEdit"
-        @change="changeWfEdit"
-      ></el-switch>
+      <el-switch v-model="optionModel.wfEdit" @change="changeWfEdit"></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('流程节点信息')">
-      <a
-        href="javascript:void(0);"
-        class="a-link link-oneLind"
-        @click="openDialog"
-      >
+      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
         <span>{{
-          optionModel.wfConfigData && optionModel.wfConfigData.length
-            ? "已维护"
-            : ""
+          optionModel.wfConfigData && optionModel.wfConfigData.length ? "已维护" : ""
         }}</span>
         <i class="el-icon-edit"></i>
       </a>
@@ -30,14 +21,9 @@
       <el-switch v-model="optionModel.wfModifyDataEnabled"></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('更改业务数据信息')">
-      <a
-        href="javascript:void(0);"
-        class="a-link link-oneLind"
-        @click="openDialog2"
-      >
+      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog2">
         <span>{{
-          optionModel.wfModifyDataConfig &&
-          optionModel.wfModifyDataConfig.length
+          optionModel.wfModifyDataConfig && optionModel.wfModifyDataConfig.length
             ? "已维护"
             : ""
         }}</span>
@@ -71,11 +57,7 @@
           stripe=""
           style="margin-bottom: 0px"
         >
-          <el-table-column
-            type="index"
-            width="35"
-            fixed="left"
-          ></el-table-column>
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
           <el-table-column :label="i18nt('组织编码')" width="250">
             <template slot-scope="{ row, $index }">
               <el-input
@@ -109,10 +91,7 @@
               <base-input-number v-model="row.modelOrders" clearable></base-input-number>
             </template>
           </el-table-column>
-          <el-table-column
-            :label="i18nt('节点步骤（多个值用“,”隔开）')"
-            width="250"
-          >
+          <el-table-column :label="i18nt('节点步骤（多个值用“,”隔开）')" width="250">
             <template slot-scope="{ row }">
               <el-input v-model="row.taskSteps" clearable></el-input>
             </template>
@@ -156,11 +135,7 @@
         </el-table>
       </div>
       <div class="dialog-footer" slot="footer">
-        <el-button
-          @click="dialogVisible = false"
-          class="button-sty"
-          icon="el-icon-close"
-        >
+        <el-button @click="dialogVisible = false" class="button-sty" icon="el-icon-close">
           {{ i18nt("designer.hint.cancel") }}
         </el-button>
         <el-button
@@ -199,17 +174,14 @@
           stripe=""
           style="margin-bottom: 0px"
         >
-          <el-table-column
-            type="index"
-            width="35"
-            fixed="left"
-          ></el-table-column>
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
           <el-table-column :label="i18nt('流程动作')" width="150">
             <template slot-scope="{ row }">
               <el-select v-model="row.action">
                 <el-option value="start" label="流程启动"></el-option>
                 <el-option value="interrupt" label="流程中断"></el-option>
                 <el-option value="end" label="流程完成"></el-option>
+                <el-option value="specificAction" label="流程特定"></el-option>
               </el-select>
             </template>
           </el-table-column>
@@ -403,20 +375,20 @@ export default {
             type: "error",
             message: "服务名称不能为空",
           });
-          return
+          return;
         }
         if (!item.companyCodes) {
           this.$message({
             type: "error",
             message: "组织编码不能为空",
           });
-          return
+          return;
         }
-        let modelOrders = item.modelOrders??"";
+        let modelOrders = item.modelOrders ?? "";
 
         let serveName = item.serveName;
         let companyCodes = item.companyCodes;
-        let key = serveName + "_" + companyCodes+ "_"+modelOrders;
+        let key = serveName + "_" + companyCodes + "_" + modelOrders;
         if (!map[key]) {
           map[key] = true;
         } else {

package/src/views/user/form/view/list.vue

@@ -145,7 +145,7 @@ export default {
     },
     getReportTemplate() {
       this.$http({
-        aes: true,
+        // aes: true,
         url: USER_PREFIX + `/formTemplate/getByFormCode`,
         method: `post`,
         data: { stringOne: this.formCode },

package/src/views/user/login/indexMixin.js

@@ -109,8 +109,7 @@ export default {
   },
   methods: {
     handleLoginConfig(){
-      let loginConfig = this.$store.getters.loginConfig;
-      debugger
+      let loginConfig = this.$store.getters.loginConfig || {};
       this.loginConfig = loginConfig;
       this.initImage();
       this.initLoginMethod();

package/src/views/user/outLink/index.vue

@@ -1,57 +1,76 @@
 <template>
   <div>
-    <div id="containt" style="margin-bottom: -4px;" v-if="type==1">
-      <iframe v-if="url" :src="url" style="width: 100%;height:calc(100vh - 40px)"></iframe>
+    <div id="containt" style="margin-bottom: -4px" v-if="type == 1">
+      <iframe
+        v-if="url"
+        :src="url"
+        style="width: 100%; height: calc(100vh - 40px)"
+      ></iframe>
     </div>
-    <component :is="content" v-if="type==2"></component>
+    <component :is="content" v-if="type == 2"></component>
   </div>
 </template>
 
 <script>
-import {getToken} from "@base/utils/auth";
+import { getToken } from "@base/utils/auth";
 
 export default {
-  name: 'outLink',
+  name: "outLink",
   data() {
     return {
       url: null,
       content: null,
-      type: 0
+      type: 0,
     };
   },
   mounted() {
     let url = this.$route.query.url;
     let route = this.$route.query.route;
     if (route) {
-      this.content = require('@/views' + route).default;
+      this.content = require("@/views" + route).default;
       this.type = 2;
     } else {
-      if (url.indexOf('dw=true') >= 0) {
+      let params = this.getCustomReqUrlAndCleanUrl(url);
+      let reqUrl = params.custom_req_url;
+      if (reqUrl) {
+        this.$http({
+          url: reqUrl,
+          method: `post`,
+          data: { thirdUrl: params.newUrl },
+          isLoading: true,
+          // modalStrictly: true,
+          success: (res) => {
+            this.url = res.objx;
+            this.type = 1;
+          },
+        });
+      } else if (url.indexOf("dw=true") >= 0) {
         this.$http({
           url: USER_PREFIX + `/dw_auth/getDwAsc`,
           method: `post`,
           data: {},
           isLoading: true,
           // modalStrictly: true,
-          success: res => {
-            this.url = url.replace('dw=true', 'dw=' + res.objx.dw) + '&param=' + res.objx.param;
+          success: (res) => {
+            this.url =
+              url.replace("dw=true", "dw=" + res.objx.dw) + "&param=" + res.objx.param;
             this.type = 1;
-          }
+          },
         });
-      }else if (url.indexOf('token=platform_token') >= 0) {
+      } else if (url.indexOf("token=platform_token") >= 0) {
         this.$http({
           url: YX_PREFIX + `/fundPlatform/getToken`,
           method: `post`,
           data: {},
           isLoading: true,
-          success: res => {
-            this.url = url.replace('token=platform_token', 'token=' + res.objx);
+          success: (res) => {
+            this.url = url.replace("token=platform_token", "token=" + res.objx);
             this.type = 1;
-          }
+          },
         });
-      } else if (url.indexOf('token=true') >= 0) {
+      } else if (url.indexOf("token=true") >= 0) {
         let token = getToken();
-        this.url = url.replace('token=true', ('token=' + token))
+        this.url = url.replace("token=true", "token=" + token);
         this.type = 1;
       } else {
         this.url = url;
@@ -59,7 +78,27 @@ export default {
       }
     }
   },
-  methods: {}
+  methods: {
+    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,
+      };
+    },
+  },
 };
 </script>