cloud-web-corejs 1.1.0-dev.6 → 1.1.0-dev.61

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

@@ -1,110 +1,110 @@
-<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>
-    <component :is="content" v-if="type == 2 && content"></component>
-  </div>
-</template>
-
-<script>
-import { getToken } from "@base/utils/auth";
-import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
-
-export default {
-  name: "outLink",
-  data() {
-    return {
-      url: null,
-      content: null,
-      type: 0,
-    };
-  },
-  async mounted() {
-    let url = this.$route.query.url;
-    let route = this.$route.query.route;
-    if (route) {
-      const res = await loadViewComponentAsync(route);
-      if (res.kind === "remote") {
-        this.$message({ message: "该页面归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
-      }
-      this.content = res.component;
-      this.type = 2;
-    } else {
-      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;
-            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: {
-    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>
-
-<style></style>
+<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>
+    <component :is="content" v-if="type == 2 && content"></component>
+  </div>
+</template>
+
+<script>
+import { getToken } from "@base/utils/auth";
+import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
+
+export default {
+  name: "outLink",
+  data() {
+    return {
+      url: null,
+      content: null,
+      type: 0,
+    };
+  },
+  async mounted() {
+    let url = this.$route.query.url;
+    let route = this.$route.query.route;
+    if (route) {
+      const res = await loadViewComponentAsync(route);
+      if (res.kind === "remote") {
+        this.$message({ message: "该页面归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
+      }
+      this.content = res.component;
+      this.type = 2;
+    } else {
+      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;
+            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: {
+    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>
+
+<style></style>

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

@@ -630,3 +630,7 @@ export default {
   },
 };
 </script>
+
+<style lang="scss">
+@import "./role-box.scss";
+</style>

package/src/views/user/role/role-box.scss

@@ -0,0 +1,83 @@
+// Role permission box extracted from the app stylesheet.
+@import "~@base/styles/variables.scss";
+.role-box {
+  .item {
+    border: solid 1px $borderColor;
+    margin-bottom: 12px;
+    &.hide {
+      .t i {
+        transform: rotate(180deg);
+        -ms-transform: rotate(180deg);
+        -moz-transform: rotate(180deg);
+        -webkit-transform: rotate(180deg);
+        -o-transform: rotate(180deg);
+      }
+      .c {
+        display: none;
+      }
+    }
+    .t {
+      font-size: 13px;
+      color: #808080;
+      height: 36px;
+      line-height: 36px;
+      padding: 0 16px;
+      background: #f6faff;
+      font-weight: 600;
+      i {
+        display: inline-block;
+        float: right;
+        line-height: 36px;
+        font-size: 16px;
+        cursor: pointer;
+        -webkit-transition: all 0.2s ease-in;
+        -moz-transition: all 0.2s ease-in;
+        -o-transition: all 0.2s ease-in;
+        transition: all 0.2s ease-in;
+      }
+    }
+    .c {
+      > div {
+        border-top: solid 1px $borderColor;
+        color: #424242;
+        min-height: 45px;
+      }
+      .c-2nd {
+        width: 146px;
+        display: inline-block;
+        padding: 14px 0 0 16px;
+        font-size: $fontSizeBase;
+        color: #808080;
+        .el-checkbox__inner {
+          vertical-align: bottom;
+        }
+      }
+      .c-3rd {
+        display: inline-block;
+        width: calc(100% - 150px);
+        vertical-align: top;
+        border-left: solid 1px $borderColor;
+        padding: 0 24px;
+        .c-item {
+          padding: 10px 0;
+          border-bottom: solid 1px $borderColor;
+          &:last-child {
+            border-bottom: none;
+          }
+          .name {
+            width: 300px;
+            display: inline-block;
+            vertical-align: top;
+          }
+          .c-4th {
+            width: calc(100% - 320px);
+            display: inline-block;
+          }
+        }
+        .el-checkbox__inner {
+          vertical-align: bottom;
+        }
+      }
+    }
+  }
+}

package/src/views/user/role/voc_edit.vue

@@ -291,3 +291,7 @@ export default {
   },
 };
 </script>
+
+<style lang="scss">
+@import "./role-box.scss";
+</style>

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

@@ -63,7 +63,10 @@
                       {{ $t1("新增") }}
                     </vxe-button>
                     <base-table-export
-                      :option="{ title: $t1('账户导出'), targetRef: 'table-m1' }"
+                      :option="{
+                        title: $t1('账户导出'),
+                        targetRef: 'table-m1',
+                      }"
                       :parent-target="_self"
                     />
                     <vxe-button
@@ -74,7 +77,10 @@
                     >
                       {{ $t1("导入") }}
                     </vxe-button>
-                    <base-input-export :option="exportOption" :parent-target="_self" />
+                    <base-input-export
+                      :option="exportOption"
+                      :parent-target="_self"
+                    />
                   </template>
                   <template #buttonRight>
                     <vxe-button
@@ -478,8 +484,18 @@ export default {
             type: "input",
             common: true,
           },
-          { title: this.$t1("姓名"), field: "nickName", type: "input", common: true },
-          { title: this.$t1("手机号"), field: "mobile", type: "input", common: true },
+          {
+            title: this.$t1("姓名"),
+            field: "nickName",
+            type: "input",
+            common: true,
+          },
+          {
+            title: this.$t1("手机号"),
+            field: "mobile",
+            type: "input",
+            common: true,
+          },
           {
             title: this.$t1("角色"),
             field: "roleCodes",
@@ -512,7 +528,12 @@ export default {
               { label: this.$t1("女"), value: 2 },
             ],
           },
-          { title: this.$t1("邮编"), field: "zipCode", type: "input", common: false },
+          {
+            title: this.$t1("邮编"),
+            field: "zipCode",
+            type: "input",
+            common: false,
+          },
           {
             title: this.$t1("是否启用"),
             field: "enabled",
@@ -641,7 +662,8 @@ export default {
         method: "post",
         data: { code: "outUserRoleCode" },
         success: (res) => {
-          let value = !res.objx || !res.objx.value ? "distributor" : res.objx.value;
+          let value =
+            !res.objx || !res.objx.value ? "distributor" : res.objx.value;
           let codes = value.split(",");
           this.outUserCodes = codes;
         },

package/src/views/user/wf/iframe/index.vue

@@ -1,51 +1,51 @@
-<template>
-  <div id="containt">
-    <component
-      v-if="showWfContent && wfContent"
-      :is="wfContent"
-      visible-key="showWfContent"
-      :_dataId.sync="wfDataId"
-      :parent-target="_self"
-      :toWfArea.sync="toWfArea"
-      @reload="$reloadHandle"
-    ></component>
-  </div>
-</template>
-
-<script>
-import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
-export default {
-  data() {
-    return {
-      reportCode: null,
-      showWfContent: true,
-      wfContent: null,
-      wfDataId: '',
-      toWfArea: true
-    };
-  },
-  created() {
-    this.initData();
-  },
-  methods: {
-    async initData() {
-      let wfDataId = this.$route.query.wfDataId;
-      let wfUrl = this.$route.query.wfUrl;
-
-      let url = wfUrl + '.vue';
-      let id = wfDataId;
-      this.wfDataId = !id || typeof id == 'object' ? 0 : id;
-      // this.showWfDialog = true;
-      this.showWfContent = true;
-      const res = await loadViewComponentAsync(url);
-      if (res.kind === "remote") {
-        this.$message({ message: "该单据归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
-      }
-      this.wfContent = res.component;
-
-    }
-  }
-};
-</script>
-
-<style></style>
+<template>
+  <div id="containt">
+    <component
+      v-if="showWfContent && wfContent"
+      :is="wfContent"
+      visible-key="showWfContent"
+      :_dataId.sync="wfDataId"
+      :parent-target="_self"
+      :toWfArea.sync="toWfArea"
+      @reload="$reloadHandle"
+    ></component>
+  </div>
+</template>
+
+<script>
+import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
+export default {
+  data() {
+    return {
+      reportCode: null,
+      showWfContent: true,
+      wfContent: null,
+      wfDataId: '',
+      toWfArea: true
+    };
+  },
+  created() {
+    this.initData();
+  },
+  methods: {
+    async initData() {
+      let wfDataId = this.$route.query.wfDataId;
+      let wfUrl = this.$route.query.wfUrl;
+
+      let url = wfUrl + '.vue';
+      let id = wfDataId;
+      this.wfDataId = !id || typeof id == 'object' ? 0 : id;
+      // this.showWfDialog = true;
+      this.showWfContent = true;
+      const res = await loadViewComponentAsync(url);
+      if (res.kind === "remote") {
+        this.$message({ message: "该单据归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
+      }
+      this.wfContent = res.component;
+
+    }
+  }
+};
+</script>
+
+<style></style>

package/src/views/user/wf/iframe/index2.vue

@@ -1,64 +1,64 @@
-<template>
-  <div id="containt">
-    <component
-      v-if="showWfContent && wfContent"
-      :is="wfContent"
-      visible-key="showWfContent"
-      :outParam.sync="outParam"
-      :parent-target="_self"
-      @reload="$reloadHandle"
-    ></component>
-  </div>
-</template>
-
-<script>
-import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
-export default {
-  data() {
-    return {
-      reportCode: null,
-      showWfContent: true,
-      wfContent: null,
-      outParam: null
-    };
-  },
-  created() {
-    this.login();
-  },
-  methods: {
-    async initData() {
-      let dataId = this.$route.query.dataId;
-      let purl = this.$route.query.url;
-      let param = this.$route.query.param;
-      if (param) {
-        this.outParam = JSON.parse(param)
-      }
-      let url = purl + '.vue';
-      this.showWfContent = true;
-      const res = await loadViewComponentAsync(url);
-      if (res.kind === "remote") {
-        this.$message({ message: "该单据归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
-      }
-      this.wfContent = res.component;
-
-    },
-    login() {
-      let token = this.$route.query.access_token;
-      let url = this.$route.query.url;
-      if (token && url) {
-        this.$store
-          .dispatch('user/addToken', {
-            token
-          })
-          .then(() => {
-            this.$nextTick(() => {
-              this.initData();
-            });
-          });
-      }
-    }
-  }
-};
-</script>
-
-<style></style>
+<template>
+  <div id="containt">
+    <component
+      v-if="showWfContent && wfContent"
+      :is="wfContent"
+      visible-key="showWfContent"
+      :outParam.sync="outParam"
+      :parent-target="_self"
+      @reload="$reloadHandle"
+    ></component>
+  </div>
+</template>
+
+<script>
+import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
+export default {
+  data() {
+    return {
+      reportCode: null,
+      showWfContent: true,
+      wfContent: null,
+      outParam: null
+    };
+  },
+  created() {
+    this.login();
+  },
+  methods: {
+    async initData() {
+      let dataId = this.$route.query.dataId;
+      let purl = this.$route.query.url;
+      let param = this.$route.query.param;
+      if (param) {
+        this.outParam = JSON.parse(param)
+      }
+      let url = purl + '.vue';
+      this.showWfContent = true;
+      const res = await loadViewComponentAsync(url);
+      if (res.kind === "remote") {
+        this.$message({ message: "该单据归属子应用 " + res.owner + "，请从对应入口打开", type: "warning" });
+      }
+      this.wfContent = res.component;
+
+    },
+    login() {
+      let token = this.$route.query.access_token;
+      let url = this.$route.query.url;
+      if (token && url) {
+        this.$store
+          .dispatch('user/addToken', {
+            token
+          })
+          .then(() => {
+            this.$nextTick(() => {
+              this.initData();
+            });
+          });
+      }
+    }
+  }
+};
+</script>
+
+<style></style>

package/src/views/user/wf/wf_diy_attribute/edit.vue

@@ -171,7 +171,7 @@ export default {
         success: res => {
           let resList = res.objx || [];
           let defaulItems = [];
-          for (let i = 1; i <= 20; i++) {
+          for (let i = 1; i <= 40; i++) {
             defaulItems.push({
               attributeKey: 'param' + i,
               attributeName: null,