n20-common-lib 2.5.37 → 2.5.38

package/package.json

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

package/src/assets/css/cl-showcolumn.scss

@@ -19,6 +19,17 @@
     overflow-y: auto;
   }
 
+  .right-tree {
+    height: 400px;
+    width: 200px;
+    margin-left: 15px;
+    overflow-y: hidden;
+    .menu-tree{
+      height: 360px;
+      overflow-y: auto;
+    }
+  }
+
   .el-checkbox {
     margin: 0;
     padding-right: 16px;

package/src/components/ApprovalButtons/index.vue

@@ -66,19 +66,6 @@
         </el-form-item>
       </div>
       <div class="flex-box">
-        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="required" style="width: 70%">
-          <el-input
-            ref="msg-input"
-            v-model="messageC"
-            type="textarea"
-            :placeholder="
-              ('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
-            "
-            :maxlength="messageMax"
-            show-word-limit
-            :autosize="{ rows: 1 }"
-          />
-        </el-form-item>
         <template v-if="taskId && showBtn">
           <show-app-opi
             v-if="opiAndUser || authList.includes('showAppOpi')"
@@ -96,6 +83,19 @@
             style="width: 18%"
           />
         </template>
+        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="required" style="width: 70%">
+          <el-input
+            ref="msg-input"
+            v-model="messageC"
+            type="textarea"
+            :placeholder="
+              ('请输入操作意见（' + messageMax + '字以内），批准该意见为非必填，驳回/作废该意见为必填！') | $lc
+            "
+            :maxlength="messageMax"
+            show-word-limit
+            :autosize="{ rows: 1 }"
+          />
+        </el-form-item>
       </div>
       <el-form-item v-if="fileKit || fileKitT" label="附加上传">
         <cl-upload

package/src/components/ShowColumn/index.vue

@@ -24,7 +24,7 @@
             }}</el-link>
           </div>
           <div class="flex-item p-r" style="height: 50%; overflow: auto">
-            <el-checkbox-group :value="dragList.map((d) => d[labelKey])">
+            <el-checkbox-group :value="dragListN.map((d) => d[labelKey])">
               <template v-if="!columnsGroups">
                 <el-checkbox
                   v-for="(column, i) in columnsAs"
@@ -57,7 +57,7 @@
             </el-checkbox-group>
           </div>
         </div>
-        <div class="right-c flex-column p-t-m">
+        <div class="right-c flex-column p-t-m bd-r" v-if="!hasPX">
           <div class="m-b">
             {{ '当前选定项' | $lc }}
             <el-link type="primary" style="visibility: hidden">{{ '当前选定项' | $lc }}</el-link>
@@ -66,6 +66,42 @@
             <drag-list :list="dragList" @click="clickItem" :label-key="labelKey" :in-show-column="true" />
           </div>
         </div>
+        <div class="right-tree flex-column p-t-m" v-else>
+          <div class="m-b flex-box flex-lr flex-v">
+            {{ '当前选定项' | $lc }}
+            <el-link class="m-r-s" :underline="false" icon="n20-icon-xinzeng" @click="add">新增</el-link>
+          </div>
+          <el-tree
+            ref="menu-tree"
+            class="menu-tree"
+            :data="dragList"
+            :props="{
+              children: 'children',
+              label: 'label'
+            }"
+            node-key="menuid"
+            draggable
+            style="width: 200px"
+            @node-drop="dropMenu"
+          >
+            <span slot-scope="{ node, data }" class="menu-item flex-item flex-box flex-lr flex-v">
+              <span>
+                <i class="n20-drag-icon n20-icon-tuodong"></i>
+                <span class="text-ellipsis pointer color-primary" @click="clickItem(data)" v-if="data.label">{{
+                  data.label
+                }}</span>
+                <span v-else>{{ '未命名...' }}</span>
+              </span>
+              <el-link
+                v-if="!disabled"
+                class="n20-icon-shanchu"
+                :underline="false"
+                :disabled="inSC && item.checked"
+                @click.stop="() => removeMenu(node, data)"
+              />
+            </span>
+          </el-tree>
+        </div>
       </div>
     </div>
     <dialogWrap v-drag :visible.sync="configVisible" title="表头设置" width="350px" :close-on-click-modal="false">
@@ -87,6 +123,16 @@
         <el-button type="primary" @click="configSave">{{ '确定' | $lc }}</el-button>
       </div>
     </dialogWrap>
+    <dialogWrap v-drag :visible.sync="configVisibleN" title="新增" width="350px" :close-on-click-modal="false">
+      <el-form :model="configModelN">
+        <el-form-item label="名称" required>
+          <el-input v-model="configModelN.label" class="input-w" placeholder="请输入"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer">
+        <el-button type="primary" @click="configSaveN">{{ '确定' | $lc }}</el-button>
+      </div>
+    </dialogWrap>
     <div slot="footer" class="text-c">
       <el-button type="primary" @click="setChange">{{ '确定' | $lc }}</el-button>
       <el-button plain @click="reset">{{ '恢复默认' | $lc }}</el-button>
@@ -99,6 +145,7 @@ import { $lc } from '../../utils/i18n/index'
 import axios from '../../utils/axios'
 import dialogWrap from '../Dialog/index.vue'
 import dragList from '../DragList/index.vue'
+import forEachs from '../../utils/forEachs'
 export default {
   name: 'ShowColumn',
   components: { dialogWrap, dragList },
@@ -142,7 +189,11 @@ export default {
     },
     width: {
       type: String,
-      default: '800px'
+      default: '1000px'
+    },
+    hasPX: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -153,7 +204,15 @@ export default {
       configModel: {
         wrap: false
       },
-      userNo: sessionStorage.getItem('userNo')
+      configModelN: {
+        label: '',
+        prop: '',
+        width: 120,
+        isNew: true
+      },
+      userNo: sessionStorage.getItem('userNo'),
+      configVisibleN: false,
+      dragListN: []
     }
   },
   computed: {
@@ -184,13 +243,95 @@ export default {
       }
     },
     setState() {
-      return this.columnsAs.length && this.columnsAs.length === this.dragList.length
+      return this.columnsAs.length && this.columnsAs.length === this.dragListN.length
     },
     columnsAs() {
       return this.columns.filter((col) => !col.static)
     }
   },
+  watch: {
+    dragList: {
+      handler() {
+        let obj = []
+        forEachs(this.dragList, (item) => {
+          obj.push(item)
+        })
+        this.dragListN = obj
+        const isNew = obj.filter((item) => {
+          return item.isNew
+        })
+        isNew.forEach((item) => {
+          if (!this.columns.includes(item)) {
+            this.columns.push(item)
+          }
+        })
+      },
+      immediate: true,
+      deep: true
+    }
+  },
   methods: {
+    add() {
+      this.configVisibleN = true
+      this.configModelN.prop = 'prop' + this.configModelN.legnth
+    },
+    configSaveN() {
+      if (!this.configModelN.label) {
+        this.$message.warning('请填写名称')
+        return false
+      }
+      const hasLabel = this.dragListN.find((item) => {
+        return item.label === this.configModelN.label
+      })
+      if (hasLabel) {
+        this.$message.warning('已有重名字段,请修改')
+        return false
+      }
+      this.dragList.push(this.configModelN)
+      this.columns.push(this.configModelN)
+      this.$message.success('添加成功')
+      this.configVisibleN = false
+      this.configModelN = {
+        label: '',
+        prop: '',
+        width: 120,
+        isNew: true
+      }
+    },
+    removeMenu(node, data) {
+      let children = node.parent.data.children || node.parent.data
+      let index = children.findIndex((d) => d.prop === data.prop)
+      index !== -1 && children.splice(index, 1)
+      this.activeMenu = {}
+      this.canApply = true
+      /* this.dragListN = this.dragListN.filter((item) => {
+        return item.label !== data
+      }) */
+    },
+    dropMenu(ingNode, toNode, type) {
+      let toObj = undefined
+      let toChild = undefined
+      if (type === 'inner') {
+        toObj = toNode.data
+        toChild = toObj.children
+      } else {
+        if (Array.isArray(toNode.parent.data)) {
+          toObj = {}
+          toChild = toNode.parent.data
+        } else {
+          toObj = toNode.parent.data
+          toChild = toObj.children
+        }
+      }
+      toChild?.forEach((item, i) => {
+        item.status = 'U'
+        item.sortnum = i + 1 + ''
+        item.pmid = toObj.menuid || null
+        item.parentTreeNo = toObj.treeno || null
+      })
+
+      this.canApply = true
+    },
     clickItem(item) {
       this.configModel = item
       this.configVisible = true
@@ -263,7 +404,7 @@ function saveTransform(list, labelKey, isFilter) {
   let listN = []
   if (!isFilter) {
     list.forEach((c) => {
-      if (c.prop) {
+      if (c.prop && !c.children && !c.isNew) {
         listN.push({ _colKey: 'prop', _colVal: c.prop })
       } else if (c.slotName) {
         listN.push({ _colKey: 'slotName', _colVal: c.slotName })