n20-common-lib 1.2.7 → 1.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "1.2.7",
+  "version": "1.2.10",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/assets/css/cl-form-item.scss

@@ -151,6 +151,43 @@ $--input-max: 304px;
     }
   }
 }
+.el-form.label-width-8em {
+  margin-left: 66px;
+  margin-right: 38px;
+  .n20-title {
+    margin-left: -66px;
+    margin-right: -38px;
+  }
+  .el-form-item.col-span-24 {
+    @media only screen and (min-width: ($--l + 1px)) {
+      .el-textarea {
+        max-width: calc(25% + 1.5em + #{$--input-max});
+        width: calc(50% - 3em);
+      }
+    }
+
+    @media only screen and (max-width: $--l) {
+      .el-textarea {
+        max-width: calc(33.33% + 2em + #{$--input-max});
+        width: calc(66.66% - 2em);
+      }
+    }
+
+    @media only screen and (max-width: $--m) {
+      .el-textarea {
+        max-width: calc(50% + 3em + #{$--input-max});
+        width: 100%;
+      }
+    }
+
+    @media only screen and (max-width: $--s) {
+      .el-form-item {
+        max-width: none;
+        width: 100%;
+      }
+    }
+  }
+}
 .el-form.label-width-10em {
   margin-left: 40px;
   margin-right: 70px;
@@ -188,8 +225,123 @@ $--input-max: 304px;
     }
   }
 }
+.el-form.label-width-12em {
+  margin-left: 10px;
+  margin-right: 96px;
+  .n20-title {
+    margin-left: -10px;
+    margin-right: -96px;
+  }
+  .el-form-item.col-span-24 {
+    @media only screen and (min-width: ($--l + 1px)) {
+      .el-textarea {
+        max-width: calc(25% + 3em + #{$--input-max});
+        width: calc(50% - 6em);
+      }
+    }
+
+    @media only screen and (max-width: $--l) {
+      .el-textarea {
+        max-width: calc(33.33% + 4em + #{$--input-max});
+        width: calc(66.66% - 4em);
+      }
+    }
+
+    @media only screen and (max-width: $--m) {
+      .el-textarea {
+        max-width: calc(50% + 6em + #{$--input-max});
+        width: 100%;
+      }
+    }
+
+    @media only screen and (max-width: $--s) {
+      .el-form-item {
+        max-width: none;
+        width: 100%;
+      }
+    }
+  }
+}
+.el-form.label-width-14em {
+  margin-left: 0px;
+  margin-right: 96px;
+  .n20-title {
+    margin-left: 0px;
+    margin-right: -96px;
+  }
+  .el-form-item.col-span-24 {
+    @media only screen and (min-width: ($--l + 1px)) {
+      .el-textarea {
+        max-width: calc(25% + 4.66em + #{$--input-max});
+        width: calc(50% - 7em);
+      }
+    }
+
+    @media only screen and (max-width: $--l) {
+      .el-textarea {
+        max-width: calc(33.33% + 4.66em + #{$--input-max});
+        width: calc(66.66% - 4.66em);
+      }
+    }
+
+    @media only screen and (max-width: $--m) {
+      .el-textarea {
+        max-width: calc(50% + 7em + #{$--input-max});
+        width: 100%;
+      }
+    }
+
+    @media only screen and (max-width: $--s) {
+      .el-form-item {
+        max-width: none;
+        width: 100%;
+      }
+    }
+  }
+}
+.el-form.label-width-16em {
+  margin-left: 0px;
+  margin-right: 98px;
+  .n20-title {
+    margin-left: 0px;
+    margin-right: -96px;
+  }
+  .el-form-item.col-span-24 {
+    @media only screen and (min-width: ($--l + 1px)) {
+      .el-textarea {
+        max-width: calc(25% + 4em + #{$--input-max});
+        width: calc(50% - 8em);
+      }
+    }
+
+    @media only screen and (max-width: $--l) {
+      .el-textarea {
+        max-width: calc(33.33% + 5.33em + #{$--input-max});
+        width: calc(66.66% - 5.33em);
+      }
+    }
+
+    @media only screen and (max-width: $--m) {
+      .el-textarea {
+        max-width: calc(50% + 8em + #{$--input-max});
+        width: 100%;
+      }
+    }
+
+    @media only screen and (max-width: $--s) {
+      .el-form-item {
+        max-width: none;
+        width: 100%;
+      }
+    }
+  }
+}
 .el-form.label-width-6em,
-.label-width-10em {
+.el-form.label-width-8em,
+.el-form.label-width-10em,
+.el-form.label-width-12em,
+.el-form.label-width-14em,
+.el-form.label-width-16em {
   .el-form-item {
     width: 50%;
     display: inline-block;

package/src/components/ApprovalButtons/index.vue

@@ -126,7 +126,7 @@ export default {
     },
     // 获取提交参数
     getParam() {
-      let { typeCode, taskId, groupNo } = this.$route.query
+      let { typeCode, taskId, groupNo, isAgentcy } = this.$route.query
       return [
         {
           typeCode,
@@ -135,7 +135,8 @@ export default {
           taskDefKey: this.taskDefKey,
           message: this.messageC,
           formData: JSON.stringify(this.formData),
-          signText: this.signText
+          signText: this.signText,
+          isAgentcy: isAgentcy
         }
       ]
     },

package/src/components/CascaderArea/index.vue

@@ -36,6 +36,10 @@ export default {
     clearable: {
       type: Boolean,
       default: true
+    },
+    isUrban: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -47,7 +51,9 @@ export default {
     if (!window._china_area_tree_) {
       this.getAreaTree()
     } else {
-      this.areaTree = window._china_area_tree_
+      this.areaTree = this.isUrban
+        ? window._china_urban_tree_
+        : window._china_area_tree_
     }
   },
   methods: {
@@ -55,8 +61,10 @@ export default {
       axios
         .get('/bems/1.0/area', { isEnable: 1 }, { loading: false })
         .then(({ data }) => {
+          let dataAr = JSON.parse(JSON.stringify(data))
+          let dataUb = JSON.parse(JSON.stringify(data))
           let areaTree = list2tree(
-            data,
+            dataAr,
             'regionNo',
             'fatherNo',
             'children',
@@ -70,7 +78,21 @@ export default {
           window._china_area_tree_ = areaTree.filter(
             (a) => a.regionLevel === '1'
           )
-          this.areaTree = window._china_area_tree_
+
+          let urbanTree = list2tree(
+            dataUb.filter((d) => d.regionLevel !== '3'),
+            'regionNo',
+            'fatherNo',
+            'children',
+            'regionNo'
+          )
+
+          window._china_urban_tree_ = urbanTree.filter(
+            (a) => a.regionLevel === '1'
+          )
+          this.areaTree = this.isUrban
+            ? window._china_urban_tree_
+            : window._china_area_tree_
         })
     },
     updateArea() {

package/src/components/FileExportAsync/index.vue

@@ -0,0 +1,174 @@
+<template>
+  <div style="display: none">
+    <el-dialog
+      v-drag
+      :visible.sync="pgsV"
+      title="文件导出"
+      width="432px"
+      top="calc(50vh - 92px)"
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :before-close="exportCancel"
+    >
+      <div class="flex-box m-b">
+        <span class="m-r">导出文件</span>
+        <span class="flex-item">{{ fileName }}</span>
+      </div>
+      <div class="flex-box m-b">
+        <span class="m-r">导出进度</span>
+        <el-progress
+          class="flex-item"
+          :percentage="pgsVal"
+          :status="pgsStatus"
+          style="margin-right: -10px"
+        />
+      </div>
+      <span slot="footer">
+        <el-button plain @click="exportCancel">取消</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import downloadBlob from '../../utils/downloadBlob'
+export default {
+  name: 'FileExportAsync',
+  props: {
+    fileName: {
+      type: String,
+      default: undefined
+    },
+    stepTime: {
+      type: Number,
+      default: 1000
+    },
+    waitTime: {
+      type: Number,
+      default: 10000
+    }
+  },
+  data() {
+    return {
+      pgsV: false,
+      pgsVal: 0,
+      status: undefined, //init progress success error
+      timer: undefined,
+      elapsedTimeout: 0,
+      waitPopV: false
+    }
+  },
+  computed: {
+    pgsStatus() {
+      if (this.status === 'error') {
+        return 'exception'
+      } else {
+        return undefined
+      }
+    }
+  },
+  methods: {
+    export() {
+      this.pgsVal = 0
+      this.status = 'init'
+      clearTimeout(this.timer)
+      this.elapsedTimeout = 0
+      this.waitPopV = false
+
+      this.pgsV = true
+      this.exportReq()
+    },
+    // 导出请求
+    exportReq() {
+      this.status = 'progress'
+
+      this.$emit('export-req', this.exportPgs)
+    },
+    // 导出进度
+    exportPgs() {
+      if (this.status !== 'progress') return
+
+      this.$emit('export-pgs', (pgs, error) => {
+        if (error) {
+          this.status = 'error'
+          console.error('导出失败')
+          return
+        }
+
+        if (pgs < 100) {
+          this.pgsVal = parseInt(pgs)
+          this.status = 'progress'
+
+          clearTimeout(this.timer)
+          this.timer = setTimeout(() => {
+            this.elapsedTimeout = this.elapsedTimeout + this.stepTime
+            this.exportPgs()
+          }, this.stepTime)
+        } else {
+          this.pgsVal = parseInt(pgs)
+          this.status = 'success'
+
+          this.exportRes()
+        }
+        this.waitPop()
+      })
+    },
+    // 导出响应
+    exportRes() {
+      this.$emit('export-res', (data, error) => {
+        if (error) {
+          this.status = 'error'
+          console.error('导出失败')
+          return
+        }
+
+        this.status = 'success'
+        this.pgsVal = 100
+
+        downloadBlob(data, this.fileName)
+        this.pgsV = false
+      })
+    },
+    // 导出取消
+    exportCancel() {
+      if (this.status === 'error') {
+        this.pgsV = false
+        return
+      }
+
+      this.$msgboxPor({
+        title: '确定取消',
+        message: '取消后，数据导出将中断，是否确定取消导出？',
+        type: 'warning',
+        customClass: 'question',
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      }).then(() => {
+        clearTimeout(this.timer)
+        this.pgsV = false
+        this.$emit('export-cancel')
+      })
+    },
+    // 时间太长提示
+    waitPop() {
+      if (!this.waitPopV && this.elapsedTimeout > this.waitTime) {
+        this.waitPopV = true
+
+        this.$msgboxPor({
+          title: '提示',
+          message: '您的数据导出时间可能会比较长，是否继续导出？',
+          type: 'warning',
+          customClass: 'question',
+          confirmButtonText: '继续导出',
+          cancelButtonText: '取消'
+        }).catch(() => {
+          clearTimeout(this.timer)
+          this.pgsV = false
+          this.$emit('export-cancel')
+        })
+      }
+    }
+  }
+}
+</script>

package/src/components/InputNumber/index.vue

@@ -6,7 +6,7 @@
       :class="{ 'n20-num--rate': type === 'rate' }"
       :value="valueStr"
       :disabled="disabled"
-      :placeholder="$attrs.placeholder"
+      :placeholder="phd"
       @focus="focusFn"
     />
     <el-input-number
@@ -17,6 +17,7 @@
       :controls="false"
       v-bind="$attrs"
       :value="valueNum"
+      :placeholder="phd"
       v-on="listeners"
       @blur="blurFn"
       @change="changeFn"
@@ -53,6 +54,10 @@ export default {
       type: Boolean,
       default: false
     },
+    placeholder: {
+      type: String,
+      default: undefined
+    },
     dNum: {
       type: Number,
       default: undefined
@@ -74,6 +79,17 @@ export default {
       showStr: true
     }
   },
+  computed: {
+    phd() {
+      if (this.placeholder) {
+        return this.placeholder
+      } else if (this.type === 'rate') {
+        return '请输入利率'
+      } else {
+        return '请输入金额'
+      }
+    }
+  },
   watch: {
     value: {
       handler(val) {

package/src/components/Layout/AsideNav/index.vue

@@ -1,143 +1,65 @@
 <template>
   <el-menu
-      class="layout-aside flex-column"
-      :collapse="collapse"
-      :default-active="activeNav"
-      background-color="#3d4b6a"
-      text-color="#fefefea6"
-      active-text-color="#ffffff"
+    class="layout-aside flex-column"
+    :collapse="collapse"
+    :default-active="activeNav"
+    background-color="#3d4b6a"
+    text-color="#fefefea6"
+    active-text-color="#ffffff"
   >
     <template v-for="omenus in menus">
-      <template v-for="item in omenus.menu">
+      <template v-for="itemA in omenus.menu">
         <!-- 一级菜单 -->
-        <el-menu-item
-            v-if="!item.children"
-            :key="item.title"
-            :index="item.uuid"
-            @click="linkFn(item)"
-        >
-          <i
-              v-if="item.iconUrl"
-              class="el-icon- icon-url"
-              :style="{ backgroundImage: `url(${item.iconUrl})` }"
-          ></i>
-          <i v-else :class="item.iconClass"></i>
-          <span v-if="!item.href" slot="title">{{ item | titleF }}</span>
-          <a
-              v-else
-              slot="title"
-              :href="item.href"
-              target="_blank"
-              :rel="/^\//.test(item.href) ? 'opener' : undefined"
-          >{{ item | titleF }}</a
-          >
-        </el-menu-item>
+        <MenuItem
+          v-if="!itemA.children"
+          :key="itemA.title"
+          :item="itemA"
+          @click="linkFn"
+        />
         <el-submenu
-            v-else
-            :key="item.title"
-            :index="item.title"
-            popper-class="nav-menu-pop"
+          v-else
+          :key="itemA.title"
+          :index="itemA.title"
+          popper-class="nav-menu-pop"
         >
-          <template slot="title">
-            <i
-                v-if="item.iconUrl"
-                class="el-icon- icon-url"
-                :style="{ backgroundImage: `url(${item.iconUrl})` }"
-            ></i>
-            <i v-else :class="item.iconClass"></i>
-            <span>{{ item | titleF }}</span>
-          </template>
-          <template v-for="itemc in item.children">
+          <SubmenuTitle slot="title" :item="itemA" />
+          <template v-for="itemB in itemA.children">
             <!-- 二级菜单 -->
-            <el-menu-item
-                v-if="!itemc.children"
-                :key="itemc.title"
-                :index="itemc.uuid"
-                @click="linkFn(itemc)"
-            >
-              <i
-                  v-if="itemc.iconUrl"
-                  class="el-icon- icon-url"
-                  :style="{ backgroundImage: `url(${itemc.iconUrl})` }"
-              ></i>
-              <i v-else :class="itemc.iconClass"></i>
-              <span slot="title">{{ itemc | titleF }}</span>
-            </el-menu-item>
+            <MenuItem
+              v-if="!itemB.children"
+              :key="itemB.title"
+              :item="itemB"
+              @click="linkFn"
+            />
             <el-submenu
-                v-else
-                :key="itemc.title"
-                :index="itemc.title"
-                popper-class="nav-menu-pop"
+              v-else
+              :key="itemB.title"
+              :index="itemB.title"
+              popper-class="nav-menu-pop"
             >
-              <template slot="title">
-                <i
-                    v-if="itemc.iconUrl"
-                    class="el-icon- icon-url"
-                    :style="{ backgroundImage: `url(${itemc.iconUrl})` }"
-                ></i>
-                <i v-else :class="itemc.iconClass"></i>
-                <span>{{ itemc | titleF }}</span>
-              </template>
-              <template v-for="itemcc in itemc.children">
-                <!-- 三级菜单
-                <el-menu-item
-                  :key="itemcc.title"
-                  :index="itemcc.uuid"
-                  @click="linkFn(itemcc)"
-                >
-                  <i
-                    v-if="itemcc.iconUrl"
-                    class="el-icon- icon-url"
-                    :style="{ backgroundImage: `url(${itemcc.iconUrl})` }"
-                  ></i>
-                  <i v-else :class="itemcc.iconClass"></i>
-                  <span slot="title">{{ itemcc | titleF }}</span>
-                </el-menu-item> -->
-                <!-- 二级菜单 -->
-                <el-menu-item
-                    v-if="!itemc.children"
-                    :key="itemcc.title"
-                    :index="itemcc.uuid"
-                    @click="linkFn(itemcc)"
-                >
-                  <i
-                      v-if="itemcc.iconUrl"
-                      class="el-icon- icon-url"
-                      :style="{ backgroundImage: `url(${itemcc.iconUrl})` }"
-                  ></i>
-                  <i v-else :class="itemcc.iconClass"></i>
-                  <span slot="title">{{ itemcc | titleF }}</span>
-                </el-menu-item>
+              <SubmenuTitle slot="title" :item="itemB" />
+              <template v-for="itemC in itemB.children">
+                <!-- 三级菜单 -->
+                <MenuItem
+                  v-if="!itemC.children"
+                  :key="itemC.title"
+                  :item="itemC"
+                  @click="linkFn"
+                />
                 <el-submenu
-                    v-else
-                    :key="itemcc.title"
-                    :index="itemcc.title"
-                    popper-class="nav-menu-pop"
+                  v-else
+                  :key="itemC.title"
+                  :index="itemC.title"
+                  popper-class="nav-menu-pop"
                 >
-                  <template slot="title">
-                    <i
-                        v-if="itemcc.iconUrl"
-                        class="el-icon- icon-url"
-                        :style="{ backgroundImage: `url(${itemcc.iconUrl})` }"
-                    ></i>
-                    <i v-else :class="itemcc.iconClass"></i>
-                    <span>{{ itemcc | titleF }}</span>
-                  </template>
-                  <template v-for="itemccc in itemcc.children">
-                    <!-- 三级菜单 -->
-                    <el-menu-item
-                        :key="itemccc.title"
-                        :index="itemccc.uuid"
-                        @click="linkFn(itemccc)"
-                    >
-                      <i
-                          v-if="itemccc.iconUrl"
-                          class="el-icon- icon-url"
-                          :style="{ backgroundImage: `url(${itemccc.iconUrl})` }"
-                      ></i>
-                      <i v-else :class="itemccc.iconClass"></i>
-                      <span slot="title">{{ itemccc | titleF }}</span>
-                    </el-menu-item>
+                  <SubmenuTitle slot="title" :item="itemC" />
+                  <template v-for="itemD in itemC.children">
+                    <!-- 四级菜单 -->
+                    <MenuItem
+                      :key="itemD.title"
+                      :item="itemD"
+                      @click="linkFn"
+                    />
                   </template>
                 </el-submenu>
               </template>
@@ -149,23 +71,22 @@
     <span class="flex-item"></span>
     <div class="open-collapsed-btn">
       <span
-          :class="
+        :class="
           collapse
             ? 'n20-icon-caidanshouqi f-s-l rotate-icon'
             : 'n20-icon-caidanshouqi f-s-l'
         "
-          @click="setCollapse"
+        @click="setCollapse"
       ></span>
     </div>
   </el-menu>
 </template>
 
 <script>
-import { labelF } from '../utils'
+import MenuItem from './menuItem.vue'
+import SubmenuTitle from './submenuTitle.vue'
 export default {
-  filters: {
-    titleF: labelF
-  },
+  components: { MenuItem, SubmenuTitle },
   props: {
     menus: {
       type: Array,

package/src/components/Layout/AsideNav/menuItem.vue

@@ -0,0 +1,34 @@
+<template>
+  <el-menu-item :index="item.uuid" @click="$emit('click', item)">
+    <i
+      v-if="item.iconUrl"
+      class="el-icon- icon-url"
+      :style="{ backgroundImage: `url(${item.iconUrl})` }"
+    ></i>
+    <i v-else :class="item.iconClass"></i>
+    <span v-if="!item.href" slot="title">{{ item | titleF }}</span>
+    <a
+      v-else
+      slot="title"
+      :href="item.href"
+      target="_blank"
+      :rel="/^\//.test(item.href) ? 'opener' : undefined"
+      >{{ item | titleF }}</a
+    >
+  </el-menu-item>
+</template>
+
+<script>
+import { labelF } from '../utils'
+export default {
+  filters: {
+    titleF: labelF
+  },
+  props: {
+    item: {
+      type: Object,
+      default: () => ({})
+    }
+  }
+}
+</script>

package/src/components/Layout/AsideNav/submenuTitle.vue

@@ -0,0 +1,26 @@
+<template>
+  <component :is="'slot'">
+    <i
+      v-if="item.iconUrl"
+      class="el-icon- icon-url"
+      :style="{ backgroundImage: `url(${item.iconUrl})` }"
+    ></i>
+    <i v-else :class="item.iconClass"></i>
+    <span>{{ item | titleF }}</span>
+  </component>
+</template>
+
+<script>
+import { labelF } from '../utils'
+export default {
+  filters: {
+    titleF: labelF
+  },
+  props: {
+    item: {
+      type: Object,
+      default: () => ({})
+    }
+  }
+}
+</script>

package/src/components/LoginTemporary/form.vue

@@ -21,7 +21,7 @@
         :hide-required-asterisk="true"
         @submit.native.prevent="submitLogin"
       >
-        <el-form-item class="m-b" label="帐号" prop="username">
+        <el-form-item class="m-b" label="账号" prop="username">
           <el-input v-model="form.username" placeholder="请输入账号" />
         </el-form-item>
         <el-form-item class="m-b" label="密码" prop="password">
@@ -110,7 +110,7 @@
         :hide-required-asterisk="true"
         @submit.native.prevent="submitLogin"
       >
-        <el-form-item class="m-b" label="帐号" prop="username">
+        <el-form-item class="m-b" label="账号" prop="username">
           <el-input v-model="form.username" placeholder="请输入账号" />
         </el-form-item>
         <el-form-item class="m-b" label="密码" prop="password">

package/src/directives/VTitle/index.js

@@ -1,5 +1,7 @@
 import Tooltip from './tooltip.vue'
 
+let timer = undefined
+
 function tipShow(el, tip) {
   if (el.$tooltipTitle) {
     if (!el.$tooltipTitleOverflow || el.clientWidth < el.scrollWidth) {
@@ -8,6 +10,12 @@ function tipShow(el, tip) {
       tip.$refs['title-pop'].doDestroy()
       tip.$nextTick(() => {
         tip.visible = true
+        timer = setInterval(() => {
+          if (tip.visible && !el.scrollWidth) {
+            tipHide(el, tip)
+            clearInterval(timer)
+          }
+        }, 1000)
       })
     }
   }

package/src/index.js

@@ -44,6 +44,7 @@ import Anchor from './components/Anchor/index.vue'
 import AnchorItem from './components/Anchor/AnchorItem.vue'
 import FlowStep from './components/FlowStep/index.vue'
 import CascaderArea from './components/CascaderArea/index.vue'
+import FileExportAsync from './components/FileExportAsync/index.vue'
 /* old */
 import TableO from './components/Table/indexO.vue'
 import FiltersO from './components/Filters/indexO.vue'
@@ -59,6 +60,8 @@ import VClickOutside from './directives/VClickOutside/index.js'
 import VHas from './directives/VHas/index.js'
 
 /** 注入方法 */
+import dayjs from 'dayjs'
+import numerify from 'numerify'
 import axios from './utils/axios.js'
 import auth from './utils/auth.js'
 import { msgPor, msgboxPor } from './utils/msgboxPor.js'
@@ -121,6 +124,7 @@ const components = [
   AnchorItem,
   FlowStep,
   CascaderArea,
+  FileExportAsync,
   /* old */
   TableO,
   FiltersO,
@@ -211,8 +215,11 @@ export {
   AnchorItem,
   FlowStep,
   CascaderArea,
+  FileExportAsync,
   repairEl,
   linkPush,
   linkGo,
-  isHas
+  isHas,
+  dayjs,
+  numerify
 }