cloud-web-corejs 1.0.54-dev.63 → 1.0.54-dev.630

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

@@ -1,211 +1,211 @@
-<template>
-  <div :id="$route.query.isMobile!=='true'?'containt':''">
-    <component v-if="showWfContent && wfContent" :is="wfContent" visible-key="showWfContent" :outParam.sync="outParam"
-               :_dataId.sync="dataId" :defaultShowWfContent="defaultShowWfContent" :_isOutLink="true"
-               :parent-target="_self"
-               @reload="$reloadHandle" v-bind="queryParam"></component>
-  </div>
-</template>
-
-<script>
-import indexUtil from "@base/utils/index.js"
-import {
-  setReportGlobalParam
-} from "@base/components/xform/utils/util";
-
-export default {
-  data() {
-    return {
-      reportCode: null,
-      showWfContent: true,
-      wfContent: null,
-      outParam: null,
-      dataId: null,
-      defaultShowWfContent: null,
-      queryParam: {}
-    };
-  },
-  created() {
-    this.login();
-  },
-  mounted() {
-    history.pushState(null, null, document.URL);
-    window.addEventListener('popstate', this.handlePopState); // 在Vue组件的mounted钩子中添加事件监听
-  },
-  beforeDestroy() {
-    window.removeEventListener('popstate', this.handlePopState); // 在beforeDestroy钩子中移除事件监听
-  },
-  methods: {
-    initGlobalReqData() {
-      let fd = this.$route.query.fd;
-      if (fd) {
-        setReportGlobalParam(fd);
-      }
-    },
-    async initData() {
-      const isMobile = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent);
-      let queryParam = this.$baseLodash.cloneDeep(this.$route.query);
-      let murl = this.$route.query.urlmobile;
-      let purl = murl && isMobile ? murl : this.$route.query.url;
-      let dataId = this.$route.query.dataId;
-      if (purl == '/index') {
-        location.hash = '/home';
-        location.reload();
-        return;
-      }
-      /*let param = this.$route.query.param;
-      if (param) {
-        this.outParam = JSON.parse(param)
-      }*/
-      this.dataId = dataId;
-      if (this.$route.query.showWfContent == 'true') {
-        this.defaultShowWfContent = true;
-      }
-
-      delete queryParam.urlmobile;
-      delete queryParam.url;
-
-      if (purl.indexOf('.html') >= 0) {
-        let eUrl = purl;
-        let pstr = Object.keys(queryParam).map(key => {
-          return key + "=" + queryParam[key]
-        }).join("&")
-
-        if (pstr) {
-          if (purl.indexOf('.html?') >= 0) {
-            eUrl = eUrl + '&' + pstr
-          } else {
-            eUrl = eUrl + '?' + pstr
-          }
-        }
-
-        location.href = eUrl;
-        return
-      }
-
-      delete queryParam.dataId;
-      delete queryParam.showWfContent;
-      delete queryParam.access_token;
-      delete queryParam.tp;
-      delete queryParam.thirdparty_info;
-      delete queryParam.i18nLang;
-
-      let url = purl + '.vue';
-      this.queryParam = queryParam;
-      this.showWfContent = true;
-      // this.wfContent = require('@/views' + url).default;
-      let t = "@base/views";
-      let urlArr = [
-        '/user/bill_setting/h5_view.vue',
-        '/user/form/view/list.vue',
-        '/user/form/view/edit.vue'
-      ]
-      this.initUserInfo(() => {
-        this.initI18n();
-        if (urlArr.includes(url)) {
-          this.wfContent = require('@base/views' + url).default;
-        } else if (url.startsWith(t)) {
-          let path = url.slice(t.length);
-          this.wfContent = require('@base/views' + path).default;
-        } else {
-          this.wfContent = require('@/views' + url).default;
-        }
-      })
-    },
-    initUserInfo(callback) {
-      this.$store
-        .dispatch('user/getInfo2')
-        .then(() => {
-          callback && callback();
-        });
-    },
-    getI18nLang() {
-      let i18nLang = this.$route.query.i18nLang || "zh";
-      return i18nLang;
-    },
-    async initI18n() {
-      let lang = this.getI18nLang();
-      this.$i18n.locale = lang // 设置给本地的i18n插件
-      localStorage.setItem("i18n-lang", lang);
-      await indexUtil.initI18nMessage("business", lang, true);
-    },
-    login() {
-      let token = this.$route.query.access_token;
-      let url = this.$route.query.url;
-      let hasToken = this.$route.query.hasToken;
-      let tp = this.$route.query.tp || this.$route.query.thirdparty_info;
-      if (url) {
-        if (token) {
-          this.initByToken(token);
-        } else if (tp) {
-          this.thirdpartyLogin(tp);
-        } else if (hasToken == "true") {
-          this.$nextTick(() => {
-            this.initData();
-          });
-        }
-        this.initGlobalReqData();
-      }
-    },
-    initByToken(token) {
-      if (!token) return;
-      this.$store
-        .dispatch('user/addToken', {
-          token
-        })
-        .then(() => {
-          this.$nextTick(() => {
-            this.initData();
-          });
-        });
-    },
-    thirdpartyLogin(tp) {
-      let lang = this.getI18nLang();
-      this.$http({
-        url: USER_PREFIX + `/thirdparty_auth/login`,
-        method: `post`,
-        data: {
-          tp: tp,
-          language: lang
-        },
-        isLoading: true,
-        modalStrictly: true,
-        useToken: false,
-        success: res => {
-          let thirdpartyToken = res.objx;
-          this.initByToken(thirdpartyToken);
-        }
-      });
-    },
-    handlePopState(event) {
-      // 阻止回退
-      history.go(1);
-    }
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-::v-deep .tab-box > .el-tabs__content {
-
-  .designer-view {
-    height: calc(100vh - 33px)
-  }
-
-  .grid-height,
-  .designer-view .el-form.render-form {
-    height: calc(100vh - 41px)
-  }
-}
-
-::v-deep #containt .detail-wrap {
-  .d-header {
-    margin: -8px -12px 0;
-  }
-
-  .d-cont {
-    margin: 0 -12px;
-    height: calc(100vh - 73px)
-  }
-}
-</style>
+<template>
+  <div :id="$route.query.isMobile!=='true'?'containt':''">
+    <component v-if="showWfContent && wfContent" :is="wfContent" visible-key="showWfContent" :outParam.sync="outParam"
+               :_dataId.sync="dataId" :defaultShowWfContent="defaultShowWfContent" :_isOutLink="true"
+               :parent-target="_self"
+               @reload="$reloadHandle" v-bind="queryParam"></component>
+  </div>
+</template>
+
+<script>
+import indexUtil from "@base/utils/index.js"
+import {
+  setReportGlobalParam
+} from "@base/components/xform/utils/util";
+
+export default {
+  data() {
+    return {
+      reportCode: null,
+      showWfContent: true,
+      wfContent: null,
+      outParam: null,
+      dataId: null,
+      defaultShowWfContent: null,
+      queryParam: {}
+    };
+  },
+  created() {
+    this.login();
+  },
+  mounted() {
+    history.pushState(null, null, document.URL);
+    window.addEventListener('popstate', this.handlePopState); // 在Vue组件的mounted钩子中添加事件监听
+  },
+  beforeDestroy() {
+    window.removeEventListener('popstate', this.handlePopState); // 在beforeDestroy钩子中移除事件监听
+  },
+  methods: {
+    initGlobalReqData() {
+      let fd = this.$route.query.fd;
+      if (fd) {
+        setReportGlobalParam(fd);
+      }
+    },
+    async initData() {
+      const isMobile = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent);
+      let queryParam = this.$baseLodash.cloneDeep(this.$route.query);
+      let murl = this.$route.query.urlmobile;
+      let purl = murl && isMobile ? murl : this.$route.query.url;
+      let dataId = this.$route.query.dataId;
+      if (purl == '/index') {
+        location.hash = '/home';
+        location.reload();
+        return;
+      }
+      /*let param = this.$route.query.param;
+      if (param) {
+        this.outParam = JSON.parse(param)
+      }*/
+      this.dataId = dataId;
+      if (this.$route.query.showWfContent == 'true') {
+        this.defaultShowWfContent = true;
+      }
+
+      delete queryParam.urlmobile;
+      delete queryParam.url;
+
+      if (purl.indexOf('.html') >= 0) {
+        let eUrl = purl;
+        let pstr = Object.keys(queryParam).map(key => {
+          return key + "=" + queryParam[key]
+        }).join("&")
+
+        if (pstr) {
+          if (purl.indexOf('.html?') >= 0) {
+            eUrl = eUrl + '&' + pstr
+          } else {
+            eUrl = eUrl + '?' + pstr
+          }
+        }
+
+        location.href = eUrl;
+        return
+      }
+
+      delete queryParam.dataId;
+      delete queryParam.showWfContent;
+      delete queryParam.access_token;
+      delete queryParam.tp;
+      delete queryParam.thirdparty_info;
+      delete queryParam.i18nLang;
+
+      let url = purl + '.vue';
+      this.queryParam = queryParam;
+      this.showWfContent = true;
+      // this.wfContent = require('@/views' + url).default;
+      let t = "@base/views";
+      let urlArr = [
+        '/user/bill_setting/h5_view.vue',
+        '/user/form/view/list.vue',
+        '/user/form/view/edit.vue'
+      ]
+      this.initUserInfo(async () => {
+        await this.initI18n();
+        if (urlArr.includes(url)) {
+          this.wfContent = require('@base/views' + url).default;
+        } else if (url.startsWith(t)) {
+          let path = url.slice(t.length);
+          this.wfContent = require('@base/views' + path).default;
+        } else {
+          this.wfContent = require('@/views' + url).default;
+        }
+      })
+    },
+    initUserInfo(callback) {
+      this.$store
+        .dispatch('user/getInfo2')
+        .then(() => {
+          callback && callback();
+        });
+    },
+    getI18nLang() {
+      let i18nLang = this.$route.query.i18nLang || "zh";
+      return i18nLang;
+    },
+    initI18n() {
+      let lang = this.getI18nLang();
+      this.$i18n.locale = lang // 设置给本地的i18n插件
+      localStorage.setItem("i18n-lang", lang);
+      return indexUtil.initI18nMessage("business", lang, true);
+    },
+    login() {
+      let token = this.$route.query.access_token;
+      let url = this.$route.query.url;
+      let hasToken = this.$route.query.hasToken;
+      let tp = this.$route.query.tp || this.$route.query.thirdparty_info;
+      if (url) {
+        if (token) {
+          this.initByToken(token);
+        } else if (tp) {
+          this.thirdpartyLogin(tp);
+        } else if (hasToken == "true") {
+          this.$nextTick(() => {
+            this.initData();
+          });
+        }
+        this.initGlobalReqData();
+      }
+    },
+    initByToken(token) {
+      if (!token) return;
+      this.$store
+        .dispatch('user/addToken', {
+          token
+        })
+        .then(() => {
+          this.$nextTick(() => {
+            this.initData();
+          });
+        });
+    },
+    thirdpartyLogin(tp) {
+      let lang = this.getI18nLang();
+      this.$http({
+        url: USER_PREFIX + `/thirdparty_auth/login`,
+        method: `post`,
+        data: {
+          tp: tp,
+          language: lang
+        },
+        isLoading: true,
+        modalStrictly: true,
+        useToken: false,
+        success: res => {
+          let thirdpartyToken = res.objx;
+          this.initByToken(thirdpartyToken);
+        }
+      });
+    },
+    handlePopState(event) {
+      // 阻止回退
+      history.go(1);
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep .tab-box > .el-tabs__content {
+
+  .designer-view {
+    height: calc(100vh - 33px)
+  }
+
+  .grid-height,
+  .designer-view .el-form.render-form {
+    height: calc(100vh - 41px)
+  }
+}
+
+::v-deep #containt .detail-wrap {
+  .d-header {
+    margin: -8px -12px 0;
+  }
+
+  .d-cont {
+    margin: 0 -12px;
+    height: calc(100vh - 73px)
+  }
+}
+</style>

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

@@ -1,48 +1,104 @@
 <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";
+
 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) {
+        this.$http({
+          url: YX_PREFIX + `/fundPlatform/getToken`,
+          method: `post`,
+          data: {},
+          isLoading: true,
+          success: (res) => {
+            this.url = url.replace("token=platform_token", "token=" + res.objx);
             this.type = 1;
-          }
+          },
         });
+      } else if (url.indexOf("token=true") >= 0) {
+        let token = getToken();
+        this.url = url.replace("token=true", "token=" + token);
+        this.type = 1;
       } else {
         this.url = url;
         this.type = 1;
       }
     }
   },
-  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>
 

package/src/views/user/position/list.vue

@@ -33,11 +33,11 @@
                     <el-input v-model="formData.name" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item :title="$t1('岗位编码')+':'" field="code">
+                <!-- <vxe-form-item :title="$t1('岗位编码')+':'" field="code">
                   <template v-slot>
                     <el-input v-model="formData.code" size="small" clearable/>
                   </template>
-                </vxe-form-item>
+                </vxe-form-item> -->
               </vxe-form>
             </template>
           </vxe-grid>
@@ -96,11 +96,11 @@ export default {
             width: 150,
             fixed: 'left'
           },
-          {
+          /* {
             field: 'code',
             title: this.$t1('岗位编码'),
             width: 250
-          },
+          }, */
           {title: this.$t1('所属组织'), field: 'companyName', width: 150},
           {
             field: 'enabled',

package/src/views/user/project_tag/dialog.vue

@@ -144,19 +144,24 @@ export default {
             field: 'tagRemark',
             width: 250
           },
+          {
+            field: 'createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
           {
             field: 'createDate',
             title: this.$t1('创建时间'),
             width: 150
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
+            field: 'modifyBy',
+            title: this.$t1('更新人'),
             width: 150
           },
           {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
             width: 150
           },
           {

package/src/views/user/project_tag/edit.vue

@@ -46,11 +46,11 @@
             </tr>
             <tr>
               <th>{{ $t1('创建人') }}</th>
-              <td>{{ projectTag._createBy }}</td>
+              <td>{{ projectTag.createBy }}</td>
               <th>{{ $t1('创建时间') }}</th>
               <td>{{ projectTag.createDate }}</td>
               <th>{{ $t1('更新人') }}</th>
-              <td>{{ projectTag._modifyBy }}</td>
+              <td>{{ projectTag.modifyBy }}</td>
               <th>{{ $t1('更新时间') }}</th>
               <td>{{ projectTag.modifyDate }}</td>
             </tr>

package/src/views/user/project_tag/list.vue

@@ -113,19 +113,24 @@ export default {
             field: 'tagRemark',
             width: 250
           },
+          {
+            field: 'createBy',
+            title: this.$t1('创建人'),
+            width: 150
+          },
           {
             field: 'createDate',
             title: this.$t1('创建时间'),
             width: 150
           },
           {
-            field: '_createBy',
-            title: this.$t1('创建人'),
+            field: 'modifyBy',
+            title: this.$t1('更新人'),
             width: 150
           },
           {
-            field: '_modifyBy',
-            title: this.$t1('更新人'),
+            field: 'modifyDate',
+            title: this.$t1('更新时间'),
             width: 150
           },
           {

package/src/views/user/push_setting/list.vue

@@ -32,7 +32,7 @@
                     <el-input v-model="formData.dataType" size="small" clearable/>
                   </template>
                 </vxe-form-item>
-                <vxe-form-item title="推送企业编码:" field="pushCompanyCode">
+                <vxe-form-item title="推送组织编码:" field="pushCompanyCode">
                   <template v-slot>
                     <el-input v-model="formData.pushCompanyCode" size="small" clearable/>
                   </template>
@@ -142,7 +142,7 @@ export default {
             fixed: 'left'
           },
           {
-            title: '推送企业编码',
+            title: '推送组织编码',
             field: 'pushCompanyCode',
             width: 150
           },