n20-common-lib 2.1.3 → 2.1.4

package/package.json

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

package/src/assets/css/normalize.scss

@@ -1,13 +1,7 @@
-$--font-size-base: 14px !default;
-$--border-color-base: #dcdfe6 !default;
-$--border-radius-base: 4px !default;
-$--input-width: 224px !default;
-
 // 项目中可以直接使用
 // .input-w {width: $--input-width;}
 // .button-4em{min-width: 72px;}
-/* 格式化样式
----------------- */
+/* 格式化样式 */
 html {
   height: 100%;
 }
@@ -31,8 +25,7 @@ iframe {
   outline: none;
 }
 
-/* 滚动条样式
---------------- */
+/* 滚动条样式 */
 ::-webkit-scrollbar {
   width: 6px;
   height: 6px;
@@ -81,8 +74,7 @@ iframe {
   --client-height: calc(100vh - 116px);
 }
 
-/* 内外边距
---------------- */
+/* 内外边距 */
 @mixin set-pm($m, $p) {
   .p-a#{$m} {
     padding: $p;
@@ -148,8 +140,7 @@ iframe {
 @include set-pm('-ss', 4px !important);
 @include set-pm('-0', 0 !important);
 
-/* 内外边距
---------------- */
+/* 内外边距 */
 @mixin pm-fn($n) {
   .pa-#{$n} {
     padding: #{$n}px;
@@ -221,8 +212,7 @@ iframe {
 @include pm-fn(12);
 @include pm-fn(14);
 
-/* 浮动布局
---------------- */
+/* 浮动布局 */
 .left,
 .float-left {
   float: left;
@@ -265,8 +255,7 @@ iframe {
   clear: right;
 }
 
-/* 行内块元素水平垂直对齐方式
---------------- */
+/* 行内块元素水平垂直对齐方式 */
 .b-center {
   text-align: center;
 
@@ -294,8 +283,7 @@ iframe {
   }
 }
 
-/* 文字居中
---------------- */
+/* 文字居中 */
 .text {
   &-c {
     text-align: center !important;
@@ -321,8 +309,7 @@ iframe {
   }
 }
 
-/* 弹性盒模型
---------------- */
+/* 弹性盒模型 */
 .flex-box {
   display: flex;
 }
@@ -573,34 +560,29 @@ iframe {
   color: #333;
 }
 
-/* 鼠标默认样式
---------------- */
+/* 鼠标默认样式 */
 .cursor-d {
   cursor: default;
 }
 
-/* 鼠标小手
---------------- */
+/* 鼠标小手 */
 .pointer {
   cursor: pointer;
 }
 
-/* 鼠标禁止
----------------- */
+/* 鼠标禁止- */
 .cursor-not {
   cursor: not-allowed;
 }
 
-/* 字重
---------------- */
+/* 字重 */
 .font {
   &-w600 {
     font-weight: var(--font-weight-bold);
   }
 }
 
-/* 字号
---------------- */
+/* 字号 */
 .f-s {
   &-s {
     /* 12号字 */
@@ -627,8 +609,7 @@ iframe {
   }
 }
 
-/* 宽高范围是 60-1000
----------------- */
+/* 宽高范围是 60-1000- */
 $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 220, 230, 240, 250, 260, 270, 280, 290,
   300, 400, 500, 600, 700, 800, 900, 1000;
 
@@ -690,8 +671,7 @@ $list: 45, 60, 80, 100, 110, 120, 130, 140, 150, 160, 170, 180, 190, 200, 210, 2
   }
 }
 
-/* 垂直对齐
---------------- */
+/* 垂直对齐 */
 .align {
   &-baseline {
     vertical-align: baseline; // 将一个元素的基线与其父元素的基线对齐。

package/src/components/DatePicker/por.vue

@@ -166,7 +166,7 @@ export default {
       this.pickerOptions
     )
 
-    this.listeners = Object.assign({}, this.$listeners, { input: () => {} })
+    this.listeners = Object.assign({}, this.$listeners, { input: () => {}, change: () => {} })
     return {}
   },
   computed: {

package/src/components/FileUploadTable/index.vue

@@ -1,253 +1,161 @@
 <template>
   <div class="file-upload-table">
-    <!-- 查看附件信息 -->
-    <template v-if="readonly">
-      <div class="p-b-s">
-        <div class="flex-box flex-v flex-lr">
-          <div><slot name="title"></slot></div>
-          <slot v-if="tableData.length" name="down-btn">
-            <el-button size="mini" plain @click="downRows">{{ '批量下载' | $lc }}</el-button>
-          </slot>
-        </div>
-      </div>
-
-      <el-table :data="tableData" :row-key="keys.rowKey" @selection-change="(selection) => (selectionList = selection)">
-        <slot name="selection-column">
-          <el-table-column type="selection" width="50" align="center" />
+    <div class="flex-box flex-v flex-lr m-b-s">
+      <div><slot name="title"></slot></div>
+      <div>
+        <slot v-if="!readonly" name="add-btn">
+          <el-button type="primary" size="mini" @click="addRow">{{ '新增' | $lc }}</el-button>
         </slot>
-        <template v-if="dataPorp.slotHeader">
-          <el-table-column
-            v-for="item in dataPorp.slotHeader"
-            :key="item.prop"
-            :label="item.label"
-            :prop="item.prop"
-            :align="item.align || 'center'"
-            :width="item.width || 'auto'"
-            :show-overflow-tooltip="item['show-overflow-tooltip']"
-          />
-        </template>
-        <template v-else>
-          <el-table-column :label="'附件类型' | $lc" :prop="keys.type">
-            <template slot="header" slot-scope="scope">
-              <slot name="type-header" :column="scope.column">{{ '附件类型' | $lc }}</slot>
-            </template>
-            <template slot-scope="{ row }">
-              <slot name="type" :row="row">{{ row[keys.type] | typeFiter(typeOptions) }}</slot>
-            </template>
-          </el-table-column>
-          <el-table-column :label="'附件名称' | $lc" :prop="keys.name">
-            <template slot="header" slot-scope="scope">
-              <slot name="name-header" :column="scope.column">{{ '附件名称' | $lc }}</slot>
-            </template>
-            <template slot-scope="{ row }">
-              <slot name="name" :row="row">{{ row[keys.name] ? row[keys.name].replace(/\.[A-z0-9]+$/, '') : '' }}</slot>
-            </template>
-          </el-table-column>
-          <el-table-column :label="'附件上传' | $lc" :prop="keys.name">
-            <template slot="header" slot-scope="scope">
-              <slot name="name-header" :column="scope.column">{{ '附件上传' | $lc }}</slot>
-            </template>
-            <template slot-scope="{ row }">
-              <slot name="name" :row="row">{{ $options.filters.fileName(row, keys.url) || row[keys.name] }}</slot>
-            </template>
-          </el-table-column>
-          <template slot-scope="{ row }">
-            <slot name="slotCol" :row="row"></slot>
-          </template>
-          <el-table-column :label="'上传时间' | $lc" :prop="keys.time" width="170" align="left">
-            <template slot="header" slot-scope="scope">
-              <slot name="time-header" :column="scope.column">{{ '上传时间' | $lc }}</slot>
-            </template>
-            <template slot-scope="{ row }">
-              <slot name="time" :row="row">{{ row[keys.time] }}</slot>
-            </template>
-          </el-table-column>
-          <el-table-column :label="'上传人' | $lc" :prop="keys.user">
-            <template slot="header" slot-scope="scope">
-              <slot name="user-header" :column="scope.column">{{ '上传人' | $lc }}</slot>
-            </template>
-            <template slot-scope="{ row }">
-              <slot name="user" :row="row">{{ row[keys.user] }}</slot>
-            </template>
-          </el-table-column>
-        </template>
-        <el-table-column :label="'操作' | $lc" align="center" width="80" fixed="right">
-          <template slot="header" slot-scope="scope">
-            <slot name="handle-header" :column="scope.column">{{ '操作' | $lc }}</slot>
-          </template>
-          <template slot-scope="{ row }">
-            <slot name="handle" :row="row">
-              <el-button type="text" icon="el-icon-view" @click="seeFile(row)" />
-              <el-button type="text" icon="el-icon-download" :disabled="!row[keys.url]" @click="downFile(row)" />
-            </slot>
-          </template>
-        </el-table-column>
-      </el-table>
-    </template>
-    <!-- 上传附件 -->
-    <template v-else>
-      <div class="p-b-s">
-        <div class="flex-box flex-v flex-lr">
-          <div><slot name="title"></slot></div>
-          <div>
-            <slot name="add-btn">
-              <el-button type="primary" size="mini" @click="addRow">{{ '新增' | $lc }}</el-button>
-            </slot>
-            <slot v-if="showBatchUpload" name="batch-btn">
-              <el-button size="mini" plain @click="visibleBatch = true">{{ '批量上传' | $lc }}</el-button>
-            </slot>
-            <slot v-if="tableData.length" name="down-btn">
-              <el-button size="mini" plain @click="downRows">{{ '下载' | $lc }}</el-button>
-            </slot>
-            <slot v-if="tableData.length" name="delete-btn">
-              <el-button type="danger" plain size="mini" @click="deleteRows">{{ '删除' | $lc }}</el-button>
-            </slot>
-          </div>
-        </div>
-      </div>
-      <el-table :data="tableData" :row-key="keys.rowKey" @selection-change="(selection) => (selectionList = selection)">
-        <slot name="selection-column">
-          <el-table-column type="selection" width="50" align="center" />
+        <slot v-if="!readonly && showBatchUpload" name="batch-btn">
+          <el-button size="mini" plain @click="visibleBatch = true">{{ '批量上传' | $lc }}</el-button>
         </slot>
-        <template v-if="dataPorp.slotHeader">
-          <el-table-column
-            v-for="item in dataPorp.slotHeader"
-            :key="item.prop"
-            :label="item.label"
-            :prop="item.prop"
-            :align="item.align || 'center'"
-            :width="item.width || 'auto'"
-            :show-overflow-tooltip="item['show-overflow-tooltip']"
-          />
-        </template>
-        <template v-else>
-          <el-table-column :label="'附件类型' | $lc" min-width="160">
-            <template slot="header" slot-scope="scope">
-              <slot name="type-header" :column="scope.column">{{ '附件类型' | $lc }}</slot>
-            </template>
-            <template slot-scope="{ row }">
-              <slot name="type" :row="row">
-                <el-select
-                  v-model="row[keys.type]"
-                  :disabled="row['_typeDisabled']"
-                  :placeholder="'请选择' | $lc"
-                  style="width: 100%"
-                >
-                  <el-option
-                    v-for="item in typeOptions"
-                    :key="item.type"
-                    :disabled="item.disabled"
-                    :value="item.type"
-                    :label="item.label"
-                  />
-                </el-select>
-              </slot>
-            </template>
-          </el-table-column>
-          <el-table-column :label="'附件名称' | $lc" min-width="160">
-            <template slot="header" slot-scope="scope">
-              <slot name="name-header" :column="scope.column">{{ '附件名称' | $lc }}</slot>
-            </template>
-            <template slot-scope="{ row }">
-              <slot name="name" :row="row">
-                <el-input
-                  :value="row[keys.name] ? row[keys.name].replace(/\.[A-z0-9]+$/, '') : ''"
-                  disabled
-                  :placeholder="'请输入' | $lc"
-                />
-              </slot>
-            </template>
-          </el-table-column>
-          <el-table-column :label="'附件上传' | $lc" min-width="160">
-            <template slot="header" slot-scope="scope">
-              <slot name="upload-header" :column="scope.column">{{ '附件上传' | $lc }}</slot>
-            </template>
-            <template slot-scope="{ row, $index }">
-              <slot name="upload" :row="row" :$index="$index">
-                <Upload
-                  :ref="'upload' + $index"
-                  class="n20-upload-table-up"
-                  :file-name="row | fileName(keys.url)"
-                  :data="row['_fileData'] || fileData"
-                  :msg-type="null"
-                  :show-clear="false"
-                  :action="action"
-                  :headers="headers"
-                  :disabled="!row[keys.type] || row['_typeDisabled']"
-                  :accept="row[keys.type] | acceptFilter(typeOptions, fileAccept)"
-                  :size="row[keys.type] | sizeFilter(typeOptions, fileSize)"
-                  :http-request="uploadHttpRequest ? (options) => uploadHttpRequest(options, row) : undefined"
-                  :before-upload="(file) => beforeUploadFn(file, row)"
-                  :on-progress="(event) => onProgressFn(event, row)"
-                  :on-success="(response, file, fileList) => onSuccessFn(response, file, fileList, row)"
-                  :on-error="(err, file, fileList) => errorFn(err, file, fileList, row, $index)"
-                />
-              </slot>
-            </template>
-          </el-table-column>
-          <slot name="slotCol"></slot>
-          <el-table-column :label="'上传时间' | $lc" :prop="keys.time" width="170" align="left">
-            <template slot="header" slot-scope="scope">
-              <slot name="time-header" :column="scope.column">{{ '上传时间' | $lc }}</slot>
-            </template>
-            <template slot-scope="{ row }">
-              <slot name="time" :row="row">{{ row[keys.time] }}</slot>
-            </template>
-          </el-table-column>
-          <el-table-column :label="'上传人' | $lc" :prop="keys.user" width="100">
-            <template slot="header" slot-scope="scope">
-              <slot name="user-header" :column="scope.column">{{ '上传人' | $lc }}</slot>
-            </template>
-            <template slot-scope="{ row }">
-              <slot name="user" :row="row">{{ row[keys.user] }}</slot>
-            </template>
-          </el-table-column>
-        </template>
-        <el-table-column :label="'上传进度' | $lc" width="220">
-          <template slot="header" slot-scope="scope">
-            <slot name="percent-header" :column="scope.column">{{ '上传进度' | $lc }}</slot>
-          </template>
-          <template slot-scope="{ row, $index }">
-            <slot name="percent" :row="row" :$index="$index">
-              <div v-if="row['_percent'] >= 0 || !row['_typeDisabled']" class="flex-box flex-v">
-                <el-progress
-                  class="n20-upload-table-progress"
-                  :percentage="row['_percent']"
-                  :status="row['_status']"
-                  style="width: 140px"
-                />
-                <el-button
-                  v-if="row['_status'] === 'exception' || !row['_typeDisabled']"
-                  type="text"
-                  size="mini"
-                  style="width: 60px"
-                  @click="anewSubmitFn(row, $index)"
-                  >{{ '重新上传' | $lc }}</el-button
-                >
-                <el-button
-                  v-else-if="(row['_percent'] >= 0 && row['_percent'] < 100) || !row['_typeDisabled']"
-                  type="text"
-                  size="mini"
-                  style="width: 60px"
-                  @click="abortFn(row, $index)"
-                  >{{ '取消' | $lc }}</el-button
-                >
-              </div>
-            </slot>
-          </template>
+        <slot name="down-btn">
+          <el-button size="mini" plain @click="downRows">{{ '下载' | $lc }}</el-button>
+        </slot>
+        <slot v-if="!readonly" name="delete-btn">
+          <el-button type="danger" plain size="mini" @click="deleteRows">{{ '删除' | $lc }}</el-button>
+        </slot>
+      </div>
+    </div>
+    <el-table :data="tableData" :row-key="keys.rowKey" @selection-change="(selection) => (selectionList = selection)">
+      <slot name="selection-column">
+        <el-table-column type="selection" width="50" align="center" />
+      </slot>
+      <template v-if="dataPorp.slotHeader">
+        <el-table-column
+          v-for="item in dataPorp.slotHeader"
+          :key="item.prop"
+          :label="item.label"
+          :prop="item.prop"
+          :align="item.align || 'center'"
+          :width="item.width || 'auto'"
+          :show-overflow-tooltip="item.showOverflowTooltip || item['show-overflow-tooltip']"
+        />
+      </template>
+      <template v-else>
+        <el-table-column :label="'附件类型' | $lc" :prop="keys.type">
+          <slot slot="header" slot-scope="scope" name="type-header" :column="scope.column">{{ '附件类型' | $lc }}</slot>
+          <slot slot-scope="{ row }" name="type" :row="row">
+            <span v-if="readonly">{{ row[keys.type] | typeFiter(typeOptions) }}</span>
+            <el-select
+              v-else
+              v-model="row[keys.type]"
+              :disabled="row._typeDisabled"
+              :placeholder="'请选择' | $lc"
+              style="width: 100%"
+            >
+              <el-option
+                v-for="item in typeOptions"
+                :key="item.type"
+                :disabled="item.disabled"
+                :value="item.type"
+                :label="item.label"
+              />
+            </el-select>
+          </slot>
+        </el-table-column>
+        <el-table-column :label="'附件名称' | $lc" :prop="keys.name">
+          <slot slot="header" slot-scope="scope" name="name-header" :column="scope.column">{{ '附件名称' | $lc }}</slot>
+          <slot slot-scope="{ row }" name="name" :row="row">
+            <span v-if="readonly">{{ row[keys.name] ? row[keys.name].replace(/\.[A-z0-9]+$/, '') : '' }}</span>
+            <el-input
+              v-else
+              :value="row[keys.name] ? row[keys.name].replace(/\.[A-z0-9]+$/, '') : ''"
+              disabled
+              :placeholder="'请输入' | $lc"
+            />
+          </slot>
+        </el-table-column>
+        <el-table-column v-if="readonly" :label="'附件上传' | $lc" :prop="keys.name">
+          <slot slot="header" slot-scope="scope" name="name-header" :column="scope.column">{{ '附件上传' | $lc }}</slot>
+          <slot slot-scope="{ row }" name="name" :row="row">
+            {{ $options.filters.fileName(row, keys.url) || row[keys.name] }}
+          </slot>
+        </el-table-column>
+        <el-table-column :label="'附件上传' | $lc">
+          <slot slot="header" slot-scope="scope" name="upload-header" :column="scope.column">{{
+            '附件上传' | $lc
+          }}</slot>
+          <slot slot-scope="{ row, $index }" name="upload" :row="row" :$index="$index">
+            <Upload
+              :ref="'upload' + $index"
+              class="n20-upload-table-up"
+              :file-name="row | fileName(keys.url)"
+              :data="row['_fileData'] || fileData"
+              :msg-type="null"
+              :show-clear="false"
+              :action="action"
+              :headers="headers"
+              :disabled="!row[keys.type] || row._typeDisabled"
+              :accept="row[keys.type] | acceptFilter(typeOptions, fileAccept)"
+              :size="row[keys.type] | sizeFilter(typeOptions, fileSize)"
+              :http-request="uploadHttpRequest ? (options) => uploadHttpRequest(options, row) : undefined"
+              :before-upload="(file) => beforeUploadFn(file, row)"
+              :on-progress="(event) => onProgressFn(event, row)"
+              :on-success="(response, file, fileList) => onSuccessFn(response, file, fileList, row)"
+              :on-error="(err, file, fileList) => errorFn(err, file, fileList, row, $index)"
+            />
+          </slot>
         </el-table-column>
-        <el-table-column :label="'操作' | $lc" align="center" width="80" fixed="right">
-          <template slot="header" slot-scope="scope">
-            <slot name="handle-header" :column="scope.column">{{ '操作' | $lc }}</slot>
-          </template>
-          <template slot-scope="{ row }">
-            <slot name="handle" :row="row">
-              <el-button type="text" icon="el-icon-view" :disabled="!row[keys.url]" @click="seeFile(row)" />
-            </slot>
-          </template>
+        <slot name="slotCol"></slot>
+        <el-table-column :label="'上传时间' | $lc" :prop="keys.time" width="170" align="center">
+          <slot slot="header" slot-scope="scope" name="time-header" :column="scope.column">{{ '上传时间' | $lc }}</slot>
+          <slot slot-scope="{ row }" name="time" :row="row">{{ row[keys.time] }}</slot>
         </el-table-column>
-      </el-table>
-    </template>
+        <el-table-column :label="'上传人' | $lc" :prop="keys.user">
+          <slot slot="header" slot-scope="scope" name="user-header" :column="scope.column">{{ '上传人' | $lc }}</slot>
+          <slot slot-scope="{ row }" name="user" :row="row">{{ row[keys.user] }}</slot>
+        </el-table-column>
+      </template>
+      <el-table-column v-if="!readonly" :label="'上传进度' | $lc" width="220">
+        <template slot="header" slot-scope="scope">
+          <slot name="percent-header" :column="scope.column">{{ '上传进度' | $lc }}</slot>
+        </template>
+        <template slot-scope="{ row, $index }">
+          <slot name="percent" :row="row" :$index="$index">
+            <div v-if="row['_percent'] >= 0 && !row._typeDisabled" class="flex-box flex-v">
+              <el-progress
+                class="n20-upload-table-progress"
+                :percentage="row['_percent']"
+                :status="row['_status']"
+                text-color=""
+                style="width: 140px"
+              />
+              <el-button
+                v-if="row['_status'] === 'exception'"
+                type="text"
+                size="mini"
+                style="width: 60px"
+                @click="anewSubmitFn(row, $index)"
+                >{{ '重新上传' | $lc }}</el-button
+              >
+              <el-button
+                v-else-if="row['_percent'] >= 0 && row['_percent'] < 100"
+                type="text"
+                size="mini"
+                style="width: 60px"
+                @click="abortFn(row, $index)"
+                >{{ '取消' | $lc }}</el-button
+              >
+            </div>
+          </slot>
+        </template>
+      </el-table-column>
+      <el-table-column :label="'操作' | $lc" align="center" width="80" fixed="right">
+        <slot slot="header" slot-scope="scope" name="handle-header" :column="scope.column">{{ '操作' | $lc }}</slot>
+        <slot slot-scope="{ row }" name="handle" :row="row">
+          <el-button type="text" icon="el-icon-view" :disabled="!row[keys.url]" @click="seeFile(row)" />
+          <el-button
+            v-if="readonly"
+            type="text"
+            icon="el-icon-download"
+            :disabled="!row[keys.url]"
+            @click="downFile(row)"
+          />
+        </slot>
+      </el-table-column>
+    </el-table>
+
     <Dialog
       v-drag
       class="p-a-0"
@@ -263,7 +171,7 @@
           <img :src="previewUrl" :alt="previewName" style="display: none" />
         </ViewerImg>
         <component
-          :is="previewSameOrg ? 'object' : 'div'"
+          :is="previewSameOrg ? 'object' : 'object'"
           v-else
           :key="previewUrl"
           :data="previewUrl"
@@ -281,6 +189,7 @@
       </div>
     </Dialog>
     <Dialog
+      v-drag
       :title="'附件批量上传' | $lc"
       :visible.sync="visibleBatch"
       top="5vh"
@@ -328,15 +237,18 @@ import Dialog from '../Dialog/index.vue'
 
 import 'viewerjs/dist/viewer.css'
 import importG from '../../utils/importGlobal.js'
+
+const ViewerImg = async function () {
+  let { component } = await importG('v-viewer', () => import(/*webpackChunkName: "v-viewer"*/ 'v-viewer'))
+  return component
+}
+
 export default {
   name: 'FileUploadTable',
   components: {
     Upload,
     Dialog,
-    ViewerImg: async function () {
-      let { component } = await importG('v-viewer', () => import(/*webpackChunkName: "v-viewer"*/ 'v-viewer'))
-      return component
-    }
+    ViewerImg
   },
   filters: {
     typeFiter(type, typeOptions) {
@@ -483,9 +395,9 @@ export default {
       this.$emit('delete-rows', this.selectionList)
     },
 
-    async getFileInfo(row) {
+    async getFileInfo(row, type) {
       if (this.getFileMethod) {
-        return this.getFileMethod(row)
+        return this.getFileMethod(row, type)
       }
 
       let _url = row[this.keys.url]
@@ -519,7 +431,7 @@ export default {
       }
     },
     async seeFile(row) {
-      let { url, name, sameOrg } = await this.getFileInfo(row)
+      let { url, name, sameOrg } = await this.getFileInfo(row, 'preview')
       if (url) {
         this.previewSameOrg = sameOrg
         this.previewUrl = url
@@ -575,18 +487,17 @@ export default {
 
       let clUpload = this.$refs['upload' + $index]
       let elUpload = clUpload.$refs['upload']
-      let uploadFiles = elUpload.uploadFiles
 
-      /* 重置文件状态,并加入文件队列 */
-      let file = uploadFiles[uploadFiles.length - 1]
-      file.status = 'ready'
-      clUpload.fileList = [file]
+      // let uploadFiles = elUpload.uploadFiles
+      // /* 重置文件状态,并加入文件队列 */
+      // let file = uploadFiles[uploadFiles.length - 1]
+      // file.status = 'ready'
+      // clUpload.fileList = [file]
 
       elUpload.abort()
     },
     anewSubmitFn(row, $index) {
       this.$set(row, '_status', undefined)
-
       this.$refs['upload' + $index]?.$refs['upload']?.submit()
     }
   }

package/src/components/Filters/index.vue

@@ -43,7 +43,12 @@
       </template>
       <template v-else-if="type === 'remote'">
         <!-- 服务端保存筛选条件组 -->
-        <el-form-item v-for="(item, i) in remoteList" :key="i" class="m-b" :label="item.label">
+        <el-form-item
+          v-for="(item, i) in remoteList"
+          :key="(item.slotName || item.label || '') + i"
+          class="m-b"
+          :label="item.label"
+        >
           <slot v-if="item.slotName" :name="item.slotName"></slot>
           <form-item-input v-else :form="form" :item="item" />
         </el-form-item>

package/src/components/Filters/indexO.vue

@@ -1,5 +1,6 @@
 <template>
   <el-popover
+    ref="filterPop"
     v-model="showPop"
     :width="width"
     placement="bottom-end"
@@ -14,7 +15,7 @@
 
     <div v-click-outside="clickOut" class="n20-filter p-a-s">
       <slot></slot>
-      <el-button v-if="$slots.more" class="p-t-0 m-b-s" type="text" @click="showMore = !showMore"
+      <el-button v-if="$slots.more" class="p-t-0 m-b-s" type="text" @click="handleMore"
         ><span>{{ showMore ? $lc('收起') : $lc('更多') }}{{ '条件' | $lc }}</span
         ><i :class="showMore ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i
       ></el-button>
@@ -93,6 +94,10 @@ export default {
           this.showPop = false
         }
       }
+    },
+    handleMore() {
+      this.showMore = !this.showMore
+      setTimeout(() => this.$refs['filterPop'].updatePopper(), 360)
     }
   }
 }

package/src/components/InputNumber/index.vue

@@ -110,10 +110,8 @@ export default {
           this.valueStr = this.num2str(val)
           return
         }
-        if (val) {
-          this.valueStr = this.num2str(val)
-          this.preValue = this.valueStr
-        }
+        this.valueStr = this.num2str(val)
+        this.preValue = this.valueStr
       },
       immediate: true
     }

package/src/components/Layout/index.vue

@@ -106,7 +106,9 @@ export default {
   },
   computed: {
     activeNavC() {
-      return getShowUuid(this.activeNav, this.menuList)
+      let acTab = this.tabList.find((t) => t.uuid === this.activeNav)
+      let acNav = acTab?.query?.startPath || this.activeNav
+      return getShowUuid(acNav, this.menuList)
     }
   },
   watch: {

package/src/components/LoginSetting/index.vue

@@ -292,7 +292,7 @@ export default {
       let secondsToGo = 5
       this.$message({
         type: 'success',
-        message: `系统将在 ${secondsToGo} 秒后退出到登陆页面.`
+        message: `设置成功,系统将在 ${secondsToGo} 秒后退出到登陆页面.`
       })
       const interval = setInterval(() => {
         secondsToGo -= 1

package/src/components/LoginSetting/setItem.vue

@@ -82,7 +82,7 @@
             <el-table-column label="系统名称" prop="NAME" />
             <el-table-column label="是否在登陆页显示" align="center">
               <template slot-scope="{ row }">
-                <el-switch v-model="row.OPEN" />
+                <el-switch v-model="row.OPEN" @change="openCg" />
               </template>
             </el-table-column>
           </el-table>
@@ -91,7 +91,8 @@
           label="页面展示方式"
           :rules="{ required: true, message: '页面展示方式不能为空', trigger: 'change' }"
         >
-          <el-select v-model="form.LOGIN_TYPE" class="input-w-u">
+          <el-select v-model="form.LOGIN_TYPE" class="input-w-u" :disabled="loginTypeDisabled">
+            <el-option label="平铺展示" value="T0" />
             <el-option label="左右切换" value="T1" />
             <el-option label="平铺展示" value="T2" />
           </el-select>
@@ -131,15 +132,8 @@
       </cl-expandable-pane>
     </el-form>
     <div class="fixed-button-shadow flex-box flex-c flex-v">
-      <el-button
-        type="primary"
-        @click="
-          () => {
-            save()
-          }
-        "
-        >保存</el-button
-      >
+      <el-button type="primary" @click="save()">保存</el-button>
+      <!-- <el-button @click="queryLoginPage">{{'预览' | $lc}}</el-button> -->
     </div>
   </div>
 </template>
@@ -158,6 +152,7 @@ export default {
     this.setingId = {}
     return {
       userNo: sessionStorage.getItem('userNo'),
+      loginTypeDisabled: false,
       form: {
         LOGIN_URL: '',
         LOGIN_MODE: [],
@@ -275,6 +270,7 @@ export default {
             })
           }
         }
+        this.openCg()
 
         // this.$axios.get(`/bems/1.0/download/${this.idNo}_bg`, null, { responseType: 'blob' })
       })
@@ -282,6 +278,14 @@ export default {
     sltRow(row) {
       this.systemItem = row
     },
+    openCg() {
+      if (this.form.SYSTEM_LIST.filter((d) => d.OPEN).length <= 1) {
+        this.form.LOGIN_TYPE = 'T0'
+        this.loginTypeDisabled = true
+      } else {
+        this.loginTypeDisabled = false
+      }
+    },
     async save() {
       await this.$refs['form'].validate()
       let errItem = this.form.SYSTEM_LIST.find((d) => d.OPEN && !d.NAME)
@@ -315,7 +319,26 @@ export default {
         }
       }
 
-      this.$axios.post(`/bems/1.0/sysSetting`, data).then((res) => {})
+      this.$axios.post(`/bems/1.0/sysSetting`, data).then((res) => {
+        this.countDown()
+      })
+    },
+    Logout() {
+      this.$router.push({ path: '/login' })
+    },
+    countDown() {
+      let secondsToGo = 5
+      this.$message({
+        type: 'success',
+        message: `设置成功,系统将在 ${secondsToGo} 秒后退出到登陆页面.`
+      })
+      const interval = setInterval(() => {
+        secondsToGo -= 1
+      }, 1000)
+      setTimeout(() => {
+        clearInterval(interval)
+        this.Logout()
+      }, secondsToGo * 1000)
     }
   }
 }

package/src/components/LoginTemporary/indexN.vue

@@ -173,10 +173,11 @@ export default {
   },
   data() {
     this.realUrl = realUrl
+    let { protocol, host, pathname } = window.location
     return {
       wrapStyle: '',
       OL: false, // 切换到旧的登录页
-      logUrl: window.location.host,
+      logUrl: `${protocol}//${host}${pathname}`,
       jsonData: {
         loginTypes: ['account'],
         loginBg: undefined,
@@ -474,7 +475,7 @@ export default {
 .login-form {
   position: absolute;
   right: 103px;
-  top: calc(50% - 65px);
+  top: 50%;
   transform: translateY(-50%);
   width: 300px;
   min-height: 340px;

package/src/components/Table/index.vue

@@ -1,6 +1,7 @@
 <template>
   <el-table
     ref="el-table"
+    :key="colsKey"
     :header-cell-style="{ 'text-align': 'center' }"
     :data="data"
     :height="height"
@@ -85,11 +86,14 @@ export default {
       default: undefined
     }
   },
+  data() {
+    return {
+      colsKey: 0
+    }
+  },
   watch: {
     columns() {
-      this.$nextTick(() => {
-        this.$refs['el-table']?.doLayout()
-      })
+      this.colsKey = this.colsKey + 1
     }
   },
   mounted() {

package/src/components/Upload/index.vue

@@ -49,6 +49,7 @@
 </template>
 
 <script>
+import _axios from 'axios'
 import { $lc } from '../../utils/i18n/index'
 import auth from '../../utils/auth'
 import axios from '../../utils/axios'
@@ -244,7 +245,8 @@ export default {
           }
         }
 
-        return axios.post(opt.action, FD, {
+        let abort
+        let Pro = axios.post(opt.action, FD, {
           headers: Object.assign(auth.setHeaders(this.headers), { 'Content-Type': 'multipart/form-data' }),
           loading: false,
           onUploadProgress: (arg) => {
@@ -252,8 +254,13 @@ export default {
               arg.percent = arg.progress * 100
               opt.onProgress(arg)
             }
-          }
+          },
+          cancelToken: new _axios.CancelToken((cancel) => {
+            abort = cancel
+          })
         })
+        Pro.abort = abort
+        return Pro
       }
     },
     progressFn(event, file, fileList) {

package/src/utils/urlToGo.js

@@ -55,28 +55,55 @@ function buildURL(url, params) {
   return url
 }
 
-export function linkPush(url, params = {}) {
-  params._fromNo = Date.now()
-  sessionStorage.setItem(params._fromNo, location.href)
+export function linkPush(url = '', query = {}, $router) {
+  query._fromNo = Date.now()
+  sessionStorage.setItem(query._fromNo, location.href)
+  // 如果提供vue-router
+  if ($router && $router.options && $router.push) {
+    let base = $router.options.base || ''
+    base = base.replace(/\/$/, '')
+    base = new RegExp('^' + base)
 
-  url = buildURL(url, params)
+    if (base.test(url)) {
+      $router.push({
+        path: url.replace(base, ''),
+        query: query
+      })
+      $router = undefined
+      return
+    }
+  }
+
+  url = buildURL(url, query)
   history.pushState(null, null, url)
 }
 
-export function linkGo() {
+export function linkGo(N = -1, $router) {
   let _fromUrl
   const search = window.location.search
   let _fromRe = search.includes('_fromNo=') ? /_fromNo=(\d+)/ : /_fromId=(\d+)/
   let _fromM = search.match(_fromRe)
-  if (_fromM?.[1]) {
+  if (_fromM && _fromM[1]) {
     _fromUrl = sessionStorage.getItem(_fromM[1])
   }
 
   if (_fromUrl) {
+    // 如果提供vue-router
+    if ($router && $router.options && $router.push) {
+      let base = $router.options.base || ''
+      base = base.replace(/\/$/, '')
+      base = new RegExp('^' + base)
+
+      if (base.test(_fromUrl)) {
+        $router.push(_fromUrl.replace(base, ''))
+        $router = undefined
+        return
+      }
+    }
     // window.history.go(-1)
     // window.history.replaceState(null, null, _fromUrl)
     history.pushState(null, null, _fromUrl)
   } else {
-    window.history.go(-1)
+    window.history.go(N)
   }
 }