n20-common-lib 2.5.39 → 2.5.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.39",
+  "version": "2.5.41",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -116,4 +116,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -53,14 +53,31 @@ export default {
     getData() {
       if (this.andUser) {
         axios.post('/bems/activiti/actAppOpi/queryAppOpiAndUser', null, { loading: false }).then(({ data }) => {
-          this.approveMsgList = data || []
+          this.approveMsgList = this.getOnlyData(data || [])
         })
       } else {
         axios.post('/bems/activiti/actAppOpi/queryAppOpi', null, { loading: false }).then(({ data }) => {
-          this.approveMsgList = data.list || []
+          this.approveMsgList = this.getOnlyData(data.list || [])
         })
       }
     },
+    getOnlyData(data) {
+      const length = data.length
+      if (length === 0) {
+        return result
+      }
+      let result = []
+      const suggestionMap = {}
+      for (let i = 0; i < length; i++) {
+        let currentItem = data[i]
+        let suggestion = currentItem.suggestion
+        if (!suggestionMap[suggestion]) {
+          suggestionMap[suggestion] = true
+          result.push(currentItem)
+        }
+      }
+      return result
+    },
     changeFn() {
       // if (this.approveMsgSlt?.length) {
       this.$emit(

package/src/components/ShowColumn/index.vue

@@ -69,7 +69,9 @@
         <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>
+            <el-link class="m-r-s" :underline="false" icon="n20-icon-xinzeng" @click="add">{{
+              '新增字段' | $lc
+            }}</el-link>
           </div>
           <el-tree
             ref="menu-tree"
@@ -79,43 +81,51 @@
               children: 'children',
               label: 'label'
             }"
-            node-key="menuid"
+            node-key="prop"
             draggable
             style="width: 200px"
+            :allow-drop="allowDrop"
             @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 class="text-ellipsis pointer color-primary" @click="clickItem(data)">{{ data.label }}</span>
               </span>
-              <el-link
-                v-if="!disabled"
-                class="n20-icon-shanchu"
-                :underline="false"
-                :disabled="inSC && item.checked"
-                @click.stop="() => removeMenu(node, data)"
-              />
+              <el-link class="n20-icon-shanchu" :underline="false" @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">
+    <dialogWrap
+      v-drag
+      :visible.sync="configVisible"
+      :title="'表头设置' | $lc"
+      width="350px"
+      :close-on-click-modal="false"
+    >
       <el-form :model="configModel">
         <el-form-item>
           {{ configModel.label }}
         </el-form-item>
-        <el-form-item label="表头宽度">
-          <el-input v-model="configModel.width" style="width: 100px"></el-input>
+        <el-form-item
+          :label="'表头宽度' | $lc"
+          :rules="[
+            {
+              type: 'number',
+              trigger: ['change', 'blur'],
+              validator: validator
+            }
+          ]"
+          prop="width"
+        >
+          <el-input v-model="configModel.width" class="w-224"></el-input>
         </el-form-item>
-        <el-form-item label="是否折行">
+        <el-form-item :label="'是否折行' | $lc">
           <el-radio-group v-model="configModel.wrap">
-            <el-radio :label="true">是</el-radio>
-            <el-radio :label="false">否</el-radio>
+            <el-radio :label="true">{{ $lc('是') }}</el-radio>
+            <el-radio :label="false">{{ $lc('否') }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -123,10 +133,10 @@
         <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">
+    <dialogWrap v-drag :visible.sync="configVisibleN" :title="'新增' | $lc" 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 :label="'名称' | $lc" required>
+          <el-input v-model="configModelN.label" class="input-w" :placeholder="'请输入' | $lc"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer">
@@ -245,23 +255,29 @@ export default {
     setState() {
       return this.columnsAs.length && this.columnsAs.length === this.dragListN.length
     },
-    columnsAs() {
-      return this.columns.filter((col) => !col.static)
+    columnsAs: {
+      get() {
+        return this.columns.filter((col) => !col.static)
+      },
+      set(val) {
+        return val
+      }
     }
   },
   watch: {
     dragList: {
       handler() {
-        let obj = []
+        let arr = []
         forEachs(this.dragList, (item) => {
-          obj.push(item)
+          arr.push(item)
         })
-        this.dragListN = obj
-        const isNew = obj.filter((item) => {
+        this.dragListN = arr
+        const newArr = arr.filter((item) => {
           return item.isNew
         })
-        isNew.forEach((item) => {
-          if (!this.columns.includes(item)) {
+        newArr.forEach((item) => {
+          const index = this.columns.findIndex((col) => col.prop === item.prop || col.label === item.label)
+          if (index === -1) {
             this.columns.push(item)
           }
         })
@@ -271,25 +287,33 @@ export default {
     }
   },
   methods: {
+    validator(rule, value, callback) {
+      if (value) {
+        if (value > 300) {
+          return callback(new Error($lc('输入最大宽度不能大于300')))
+        } else if (!/^[1-9]\d*$/.test(value)) {
+          return callback(new Error($lc('表头宽度只能输入正整数')))
+        }
+      }
+      callback()
+    },
     add() {
       this.configVisibleN = true
-      this.configModelN.prop = 'prop' + this.configModelN.legnth
+      this.configModelN.prop = 'prop' + Date.now()
     },
     configSaveN() {
       if (!this.configModelN.label) {
-        this.$message.warning('请填写名称')
-        return false
+        return this.$message.warning($lc('请填写名称'))
       }
       const hasLabel = this.dragListN.find((item) => {
         return item.label === this.configModelN.label
       })
       if (hasLabel) {
-        this.$message.warning('已有重名字段,请修改')
-        return false
+        return this.$message.warning($lc('已有重名字段,请修改'))
       }
       this.dragList.push(this.configModelN)
-      this.columns.push(this.configModelN)
-      this.$message.success('添加成功')
+      this.columns = [...this.columns, this.configModelN]
+      this.$message.success($lc('添加成功'))
       this.configVisibleN = false
       this.configModelN = {
         label: '',
@@ -299,45 +323,40 @@ export default {
       }
     },
     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
-      }) */
+      const parent = node.parent
+      const children = parent.data.children || parent.data
+      const index = children.findIndex((d) => d.prop === data.prop)
+      children.splice(index, 1)
     },
-    dropMenu(ingNode, toNode, type) {
-      let toObj = undefined
-      let toChild = undefined
-      if (type === 'inner') {
-        toObj = toNode.data
-        toChild = toObj.children
+    allowDrop(draggingNode, dropNode, type) {
+      if (type === 'inner' && draggingNode.data.isNew) {
+        return !(draggingNode.level <= dropNode.level)
+      } else if (type === 'inner' && !draggingNode.data.isNew) {
+        return !(draggingNode.level <= dropNode.level && !dropNode.data.isNew)
       } else {
-        if (Array.isArray(toNode.parent.data)) {
-          toObj = {}
-          toChild = toNode.parent.data
-        } else {
-          toObj = toNode.parent.data
-          toChild = toObj.children
-        }
+        return true
+      }
+    },
+    dropMenu({ data }, toNode, type) {
+      if (type === 'inner' && !data.isNew && toNode.data.isNew) {
+        data.isNew = true
+      } else if ((type === 'before' || type === 'after') && data.isNew) {
+        data.isNew = false
       }
-      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.configModel = Object.assign({}, item)
+      this.configModel.wrap = item.wrap ?? false
       this.configVisible = true
     },
     configSave() {
       this.configVisible = false
+      const index = this.dragList.findIndex(
+        (item) => item.prop === this.configModel.prop || item.label === this.configModel.label
+      )
+      if (index > -1) {
+        this.dragList[index] = this.configModel
+      }
     },
     popOpen() {
       this.dragList = this.checkColumns.filter((col) => !col.static)
@@ -380,7 +399,6 @@ export default {
       !this.isExport && this.autoSave && this.saveColumns(list)
 
       this.$emit('setColumns', list)
-      this.visible = false
     },
     saveColumns(list) {
       let columns = saveTransform(list, this.labelKey, this.isFilter)
@@ -393,6 +411,7 @@ export default {
         },
         { loading: false }
       )
+      this.visible = false
     },
     getColumns(pageId) {
       return getColumns(pageId || this.pageId, this.userNo, this.columns, this.labelKey)
@@ -411,6 +430,9 @@ function saveTransform(list, labelKey, isFilter) {
       } else if (c.type && ['selection', 'index', 'expand'].includes(c.type)) {
         listN.push({ _colKey: 'type', _colVal: c.type })
       } else {
+        if (c.isNew && !c.children) {
+          return this.$message.warning($lc(`新增字段必须包含子级!`))
+        }
         let sFn = false
         for (let k in c) {
           if (typeof c[k] === 'function') sFn = true
@@ -483,7 +505,6 @@ export function getColumns(pageId, userNo, columnsT, labelKey = 'label') {
       .then(({ data }) => {
         if (data) {
           let _data = JSON.parse(data)
-          console.log(_data)
           if (_data && _data.length > 0) {
             let columns = getTransform(_data, columnsT, labelKey)
             return resolve(columns)

package/src/components/TablePro/index.vue

@@ -63,7 +63,7 @@
           <vxe-column
             v-for="(subItem, i) in item.children"
             :key="'vxe-table-' + i"
-            :className="item.wrap && 'vxe-table-custom-wrap'"
+            :className="item.wrap ? 'vxe-table-custom-wrap' : ''"
             :formatter="subItem.formatter ? subItem.formatter : 'formatName'"
             :filters="subItem.filters"
             :filter-render="subItem.filterRender"
@@ -74,7 +74,7 @@
         </vxe-colgroup>
         <vxe-column
           v-else
-          :className="item.wrap && 'vxe-table-custom-wrap'"
+          :className="item.wrap ? 'vxe-table-custom-wrap' : ''"
           :key="'vxe-table-' + i"
           :formatter="item.formatter ? item.formatter : 'formatName'"
           :filters="item.filters"

package/src/i18n.json

@@ -284,6 +284,36 @@
   "404，网络连接失败！": {
     "en": "404, network connection failed!"
   },
+  "新增字段": {
+    "en": "New field"
+  },
+  "请填写名称": {
+    "en": "Please fill in the name"
+  },
+  "添加成功": {
+    "en": "Added successfully"
+  },
+  "新增字段必须包含子级!": {
+    "en": "New field must contain sub-level!"
+  },
+  "已有重名字段,请修改": {
+    "en": "There is already a field with the same name, please modify"
+  },
+  "表头设置": {
+    "en": "Table header settings"
+  },
+  "是否折行": {
+    "en": "Whether to wrap"
+  },
+  "表头宽度只能输入正整数": {
+    "en": "Table header width can only input positive integers"
+  },
+  "输入最大宽度不能大于300": {
+    "en": "Input maximum width cannot exceed 300"
+  },
+  "表头宽度": {
+    "en": "Table header width"
+  },
   "条。": {
     "en": "Article."
   },