n20-common-lib 2.7.48 → 2.7.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.7.48",
+  "version": "2.7.49",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ElectronicArchive/index.vue

@@ -221,7 +221,13 @@
         </template>
         <template v-slot="{ row }">
           <slot name="handle" :row="row">
-            <el-button type="text" icon="el-icon-view" v-if="officeStatus" :disabled="!row[keys.url]" @click="seeFile(row)" />
+            <el-button
+              type="text"
+              icon="el-icon-view"
+              v-if="officeStatus"
+              :disabled="!row[keys.url]"
+              @click="seeFile(row)"
+            />
             <el-button
               v-if="readonly"
               type="text"
@@ -350,7 +356,7 @@ import Dialog from '../Dialog/index.vue'
 import 'viewerjs/dist/viewer.css'
 import importG from '../../utils/importGlobal.js'
 import downloadBlob from '../../utils/downloadBlob.js'
-import {log} from "qrcode/lib/core/galois-field";
+import { log } from 'qrcode/lib/core/galois-field'
 
 const ViewerImg = async function () {
   let { component } = await importG('v-viewer', () => import(/*webpackChunkName: "v-viewer"*/ 'v-viewer'))
@@ -461,7 +467,7 @@ export default {
       typeOptions: [],
       previewSameOrg: false,
       selectionList: [],
-      officeStatus:false
+      officeStatus: false
     }
   },
   watch: {
@@ -525,18 +531,22 @@ export default {
     }
   },
   mounted() {
-    this.getBussTypeList()
+    console.log(this.dataProp)
     this.getAttachList()
     if (this.dataProp.bussId && this.dataProp.bussValue) {
       this.getFileList()
     }
+    this.getBussTypeList()
     this.getOfficeStatus()
   },
   methods: {
-   async getOfficeStatus() {
-     const {data} =await this.$axios.get( this.requestPrefix
-          ? `${this.requestPrefix}/neams/eamsBaseFile/getOfficeIsEnable`:`/neams/eamsBaseFile/getOfficeIsEnable`)
-    this.officeStatus = data
+    async getOfficeStatus() {
+      const { data } = await this.$axios.get(
+        this.requestPrefix
+          ? `${this.requestPrefix}/neams/eamsBaseFile/getOfficeIsEnable`
+          : `/neams/eamsBaseFile/getOfficeIsEnable`
+      )
+      this.officeStatus = data
     },
     rowStyle({ row, rowIndex }) {
       if (row.isEnable === '0') {
@@ -688,6 +698,7 @@ export default {
      * @returns {Promise<void>}
      */
     async getAttachList() {
+      console.log(this.dataProp)
       const { data, code } = await axios.post(
         this.requestPrefix
           ? `${this.requestPrefix}/neams/eamsattachfile/getByBussValues`

package/src/components/TableOperateColumn/OperateBtns.vue

@@ -1,29 +1,78 @@
 <template>
   <span>
-    <el-link
-      v-for="(item, i) in dfBtns"
-      :key="item.label"
-      :class="i ? 'm-l-b' : ''"
-      :type="item.type || 'primary'"
-      :underline="false"
-      :disabled="item.disabled | dbdBtn(row)"
-      @click="$emit('command', item.command)"
-    >
-      <span v-if="item.tip" v-title="`${item.tip}`">{{ item.label }}</span>
-      <span v-else>{{ item.label }}</span>
-    </el-link>
+    <template v-for="(item, i) in dfBtns" class="flex-box flex-v">
+      <el-dropdown
+        v-if="item.children && item.children.length"
+        :key="item.label"
+        class="m-l-b"
+        @command="(c) => $emit('command', c)"
+      >
+        <div class="flex-box flex-v">
+          <el-link
+            :key="item.label"
+            :class="i ? 'm-l-b' : ''"
+            type="primary"
+            :underline="false"
+            :disabled="item.disabled | dbdBtn(row)"
+            @click="$emit('command', item.command)"
+          >
+            <span v-if="item.tip" v-title="`${item.tip}`">{{ item.label }}</span>
+            <span v-else>{{ item.label }}</span>
+          </el-link>
+          <i class="el-icon-arrow-down color-primary" />
+        </div>
+        <el-dropdown-menu slot="dropdown" class="text-c">
+          <el-dropdown-item
+            v-for="item1 in item.children"
+            :key="item1.label"
+            :command="item1.command"
+            :disabled="item1.disabled | dbdBtn(row)"
+          >
+            <el-link v-if="item1.type" :type="item1.type" :underline="false">{{ item1.label }}</el-link>
+            <template v-else>{{ item1.label }}</template>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+      <el-link
+        v-else
+        :key="item.label"
+        :class="i ? 'm-l-b' : ''"
+        :type="item.type || 'primary'"
+        :underline="false"
+        :disabled="item.disabled | dbdBtn(row)"
+        @click="$emit('command', item.command)"
+      >
+        <span v-if="item.tip" v-title="`${item.tip}`">{{ item.label }}</span>
+        <span v-else>{{ item.label }}</span>
+      </el-link>
+    </template>
+
     <el-dropdown v-if="moreBtns.length" class="m-l-b" @command="(c) => $emit('command', c)">
       <el-button class="n20-icon-moren" type="text" size="mini" />
       <el-dropdown-menu slot="dropdown" class="text-c">
-        <el-dropdown-item
-          v-for="item in moreBtns"
-          :key="item.label"
-          :command="item.command"
-          :disabled="item.disabled | dbdBtn(row)"
-        >
-          <el-link v-if="item.type" :type="item.type" :underline="false">{{ item.label }}</el-link>
-          <template v-else>{{ item.label }}</template>
-        </el-dropdown-item>
+        <template v-for="(item, i) in moreBtns">
+          <el-dropdown-item :key="i" v-if="item.children && item.children.length">
+            <template>{{ item.label }}</template>
+            <el-dropdown class="m-l-b" @command="(c) => $emit('command', c)">
+              <i class="el-icon-arrow-down" />
+              <el-dropdown-menu slot="dropdown" class="text-c">
+                <el-dropdown-item
+                  v-for="item2 in item.children"
+                  :key="item2.label"
+                  :command="item2.command"
+                  :disabled="item2.disabled | dbdBtn(row)"
+                >
+                  <el-link v-if="item2.type" :type="item2.type" :underline="false">{{ item2.label }}</el-link>
+                  <template v-else>{{ item2.label }}</template>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-dropdown-item>
+          <el-dropdown-item v-else :key="item.label" :command="item.command" :disabled="item.disabled | dbdBtn(row)">
+            <el-link v-if="item.type" :type="item.type" :underline="false">{{ item.label }}</el-link>
+            <template v-else>{{ item.label }}</template>
+          </el-dropdown-item>
+        </template>
       </el-dropdown-menu>
     </el-dropdown>
   </span>