cloud-web-corejs 1.0.54-dev.5 → 1.0.54-dev.500

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/outLink/view.vue

@@ -55,6 +55,25 @@ export default {
 
       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;
@@ -72,27 +91,34 @@ export default {
         '/user/form/view/list.vue',
         '/user/form/view/edit.vue'
       ]
-      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;
-      }
-
-      this.initI18n();
-
+      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;
     },
-    initI18n() {
+    async initI18n() {
       let lang = this.getI18nLang();
       this.$i18n.locale = lang // 设置给本地的i18n插件
       localStorage.setItem("i18n-lang", lang);
-      indexUtil.initI18nMessage("business", lang, true);
+      await indexUtil.initI18nMessage("business", lang, true);
     },
     login() {
       let token = this.$route.query.access_token;

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

@@ -3,90 +3,127 @@
     <el-form ref="editForm" :model="position">
       <div class="d-header clearfix">
         <div class="fl">
-          <i class="el-icon-info"/>
-          {{ dataId ? $t1('查看岗位') : $t1('新增岗位') }}
+          <i class="el-icon-info" />
+          {{ dataId ? $t1("查看岗位") : $t1("新增岗位") }}
         </div>
         <div class="fr">
-          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
-            {{ $t1('重置') }}
+          <el-button
+            type="primary"
+            plain
+            class="button-sty"
+            @click="$baseReload()"
+            icon="el-icon-refresh-right"
+          >
+            {{ $t1("重置") }}
           </el-button>
-          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
+          <el-button
+            type="primary"
+            class="button-sty"
+            icon="el-icon-check"
+            @click="saveData"
+            >{{ $t1("保存") }}
           </el-button>
         </div>
       </div>
-      <div class="d-cont">
-        <div class="d-item">
-          <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
-          <table class="table-detail">
-            <tbody>
-            <tr>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('岗位名称') }}
-              </th>
-              <td>
-                <el-form-item prop="name" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="position.name" clearable/>
-                </el-form-item>
-              </td>
-              <th>
-                <em class="f-red">*</em>
-                {{ $t1('岗位编码') }}
-              </th>
-              <td>
-                <template v-if="dataId">
-                  {{ position.code }}
-                </template>
-                <el-form-item v-else prop="code" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="position.code" clearable/>
-                </el-form-item>
-              </td>
-              <th>{{ $t1('设置') }}</th>
-              <td>
-                <el-checkbox :label="$t1('是否启用')" v-model="position.enabled"></el-checkbox>
-              </td>
-            </tr>
-            <tr>
-              <th>{{ $t1('备注') }}</th>
-              <td colspan="5">
-                <el-input type="textarea" :rows="2" :placeholder="$t1('请输入内容')" size="small"
-                          v-model="position.memo"
-                          clearable></el-input>
-              </td>
-            </tr>
-            <tr>
-              <th>{{ $t1('创建人') }}</th>
-              <td>{{ position._createBy }}</td>
-              <th>{{ $t1('创建时间') }}</th>
-              <td>{{ position.createDate }}</td>
-              <th>{{ $t1('更新人') }}</th>
-              <td>{{ position._modifyBy }}</td>
-              <th>{{ $t1('更新时间') }}</th>
-              <td>{{ position.modifyDate }}</td>
-            </tr>
-            </tbody>
-          </table>
-        </div>
-      </div>
+      <baseTabs>
+        <baseTabPane :label="$t1('基本信息')">
+          <template #default>
+            <table class="table-detail">
+              <tbody>
+                <tr>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1("岗位名称") }}
+                  </th>
+                  <td>
+                    <el-form-item
+                      prop="name"
+                      :rules="[{ required: true, trigger: 'blur' }]"
+                    >
+                      <el-input
+                        type="text"
+                        autocomplete="off"
+                        v-model="position.name"
+                        clearable
+                      />
+                    </el-form-item>
+                  </td>
+                  <th>
+                    <em class="f-red">*</em>
+                    {{ $t1("岗位编码") }}
+                  </th>
+                  <td>
+                    <template v-if="dataId">
+                      {{ position.code }}
+                    </template>
+                    <el-form-item
+                      v-else
+                      prop="code"
+                      :rules="[{ required: true, trigger: 'blur' }]"
+                    >
+                      <el-input
+                        type="text"
+                        autocomplete="off"
+                        v-model="position.code"
+                        clearable
+                      />
+                    </el-form-item>
+                  </td>
+                  <th>{{ $t1("设置") }}</th>
+                  <td>
+                    <el-checkbox
+                      :label="$t1('是否启用')"
+                      v-model="position.enabled"
+                    ></el-checkbox>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1("备注") }}</th>
+                  <td colspan="5">
+                    <el-input
+                      type="textarea"
+                      :rows="2"
+                      :placeholder="$t1('请输入内容')"
+                      size="small"
+                      v-model="position.memo"
+                      clearable
+                    ></el-input>
+                  </td>
+                </tr>
+                <tr>
+                  <th>{{ $t1("创建人") }}</th>
+                  <td>{{ position._createBy }}</td>
+                  <th>{{ $t1("创建时间") }}</th>
+                  <td>{{ position.createDate }}</td>
+                  <th>{{ $t1("更新人") }}</th>
+                  <td>{{ position._modifyBy }}</td>
+                  <th>{{ $t1("更新时间") }}</th>
+                  <td>{{ position.modifyDate }}</td>
+                </tr>
+              </tbody>
+            </table>
+          </template>
+        </baseTabPane>
+      </baseTabs>
     </el-form>
   </div>
 </template>
 
 <script>
 export default {
-  name: 'positionEdit',
+  name: "positionEdit",
   props: {
-    _dataId: [String, Number]
+    _dataId: [String, Number],
   },
   components: {},
   data() {
     return {
       isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
+      tabIndex: "first",
+      dataId: "",
       position: {
-        enabled: true
-      }
+        enabled: true,
+      },
     };
   },
   created() {
@@ -103,53 +140,49 @@ export default {
           url: USER_PREFIX + `/position/get`,
           method: `post`,
           data: {
-            id: this.dataId
+            id: this.dataId,
           },
           isLoading: true,
           modalStrictly: true,
-          success: res => {
+          success: (res) => {
             this.position = res.objx || {};
-          }
+          },
         });
-      } else {
-        this.position = {
-          enabled: true
-        };
       }
     },
     saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
+      this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
-          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+          this.$baseConfirm(this.$t1("您确定要保存吗？")).then(() => {
             var url = USER_PREFIX + (this.isEdit ? `/position/update` : `/position/save`);
             this.$http({
               url: url,
               method: `post`,
               data: this.position,
               isLoading: true,
-              success: res => {
+              success: (res) => {
                 this.$message({
                   message: res.content,
-                  type: 'success',
+                  type: "success",
                   duration: 500,
-                  onClose: t => {
+                  onClose: (t) => {
                     if (this.isEdit) {
                       this.$baseReload();
                     } else {
                       this.$baseReload({
                         updateParam: {
-                          _dataId: res.objx
-                        }
+                          _dataId: res.objx,
+                        },
                       });
                     }
-                  }
+                  },
                 });
-              }
+              },
             });
           });
         }
       });
-    }
-  }
+    },
+  },
 };
 </script>