n20-common-lib 2.9.78 → 2.9.80

package/package.json

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

package/src/assets/css/expandable-pane.scss

@@ -7,7 +7,12 @@ $--expandable-pane-height: 28px;
     background: $--table-header-background-color;
     color: $--color-text-primary;
     padding: 0 12px;
-    margin-bottom: 8px;
+    &__top {
+      margin-bottom: 8px;
+    }
+    &__bottom {
+      margin-top: 8px;
+    }
   }
 
   .n20-tips {
@@ -31,6 +36,9 @@ $--expandable-pane-height: 28px;
     .expand {
       transform: rotate(90deg);
     }
+    .topExpand {
+      transform: rotate(270deg);
+    }
   }
 
   .color-0 {

package/src/components/ApprovalButtons/index.vue

@@ -1,16 +1,18 @@
 /* 审批按钮组 */
 <template>
   <div :class="prefixCls">
-    <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
-      <div
-        v-if="taskId && showBtn && authList.includes('isShowOtherAtt')"
-        class="m-b-lg p-b-lg p-t-lg p-r-lg"
-        style="border: 1px dashed var(--border-color-base); border-radius: 5px"
-      >
-        <!-- <div class="p-l-lg p-t-lg p-b-s font-w600">{{ '审查意见' }}</div> -->
-        <show-other-att-new ref="showOtherAttNew" :task-id="taskId" :form="customizationDtos" />
-      </div>
-    </el-form>
+    <ExpandablePane title="自定义项" :defaultExpand="false">
+      <el-form  ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
+        <div
+          v-if="taskId && showBtn && authList.includes('isShowOtherAtt')"
+          class="m-b-lg p-b-lg p-t-lg p-r-lg"
+          style="border: 1px dashed var(--border-color-base); border-radius: 5px"
+        >
+          <show-other-att-new ref="showOtherAttNew" :task-id="taskId" :form="customizationDtos" />
+        </div>
+      </el-form>
+    </ExpandablePane>
+
     <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '6em' : '12em'">
       <div v-if="taskId && showBtn" class="flex-box">
         <el-form-item v-if="authList.includes('isCarboncopy')" :label="'抄送' | $lc" class="flex-1 m-b-s">
@@ -91,25 +93,24 @@
         </el-form-item>
       </div>
 
-      <div class="flex-box">
-        <template v-if="taskId && showBtn">
-          <show-app-opi
-            v-if="opiAndUser || authList.includes('showAppOpi')"
-            class="m-l-s"
-            :task-id="taskId"
-            :message.sync="messageC"
-            :and-user="opiAndUser"
-            style="width: 20%"
-          />
-          <show-other-att
-            v-if="authList.includes('showOtherAtt')"
-            class="flex-1 m-l"
-            :task-id="taskId"
-            :other-att="otherAtt"
-            style="width: 18%"
-          />
-        </template>
-        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="requiredC" style="width: 70%">
+      <el-form-item  :label="'审批意见' | $lc" :error="errMsg" :required="requiredC">
+          <template v-if="taskId && showBtn">
+            <show-app-opi
+              v-if="opiAndUser || authList.includes('showAppOpi')"
+              class="m-b-s"
+              :task-id="taskId"
+              :message.sync="messageC"
+              :and-user="opiAndUser"
+              
+            />
+            <show-other-att
+              v-if="authList.includes('showOtherAtt')"
+              class="flex-1 m-l"
+              :task-id="taskId"
+              :other-att="otherAtt"
+              style="width: 18%"
+            />
+          </template>
           <el-input
             ref="msg-input"
             v-model="messageC"
@@ -121,10 +122,9 @@
             }`"
             :maxlength="messageMax"
             show-word-limit
-            :autosize="{ rows: 1 }"
+            :autosize="{ minRows: 2 }"
           />
         </el-form-item>
-      </div>
       <el-form-item v-if="fileKitT" :label="$lc('附件上传')">
         <cl-upload
           class="upload-224"
@@ -295,6 +295,7 @@ import RejectToProp from './setRejectToProp.vue'
 import ShowAppOpi from './showAppOpi.vue'
 import ShowOtherAtt from './showOtherAttr.vue'
 import ShowOtherAttNew from './showOtherAttrNew.vue'
+import ExpandablePane from "../Expandable/main.vue"
 import { toExaminePath } from './specialHandle'
 const prefixCls = 'n20-approval-Button'
 // window._approvalExtend = { 'addtask.chdUserInfo.extend': {}, 'appOpi.queryAppOpiAndUser.exist': undefined, 'card.countermand.suggestion': false }
@@ -312,7 +313,8 @@ export default {
     RejectToProp,
     ShowAppOpi,
     ShowOtherAtt,
-    ShowOtherAttNew
+    ShowOtherAttNew,
+    ExpandablePane
   },
   props: {
     message: {
@@ -428,7 +430,8 @@ export default {
       isShowRetrace: undefined,
       isJump: undefined,
       showFlowDialog: false,
-      IsShowUploadWidget: false
+      IsShowUploadWidget: false,
+      showCustomItem:false
     }
   },
   computed: {

package/src/components/ApprovalButtons/showAppOpi.vue

@@ -7,7 +7,7 @@
       clearable
       :multiple="multiple"
       collapse-tags
-      :placeholder="'请选择审批意见' | $lc"
+      :placeholder="'常用审批意见，选择后将自动填充至下方输入框，您可在此基础上修改' | $lc"
       @change="changeFn"
     >
       <el-option v-for="(item, i) in approveMsgList" :key="i" :label="item.suggestion" :value="item.suggestion" />

package/src/components/Expandable/main.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="n20-form-expandable-pane">
-    <div class="n20-title flex-box flex-lr flex-v" :class="titleClass">
+    <div v-if="position === 'top'"  class="n20-title flex-box flex-lr flex-v" :class="{'n20-title__top':expand,titleClass}">
       <span class="n20-tips flex-item" @click="getExpand">
         <i v-if="icon" class="el-icon-caret-right color-0 m-r-b" :class="{ expand: expand }"></i>
         <slot name="title">
@@ -16,6 +16,17 @@
         <slot></slot>
       </div>
     </el-collapse-transition>
+    <div v-if="position === 'bottom'" class="n20-title flex-box flex-lr flex-v" :class="{'n20-title__bottom':expand,titleClass}">
+      <span class="n20-tips flex-item"  @click="getExpand">
+        <i v-if="icon" class="el-icon-caret-right color-0 m-r-b" :class="{ topExpand: expand }"></i>
+        <slot name="title">
+          <span>{{ title }}</span>
+        </slot>
+      </span>
+      <div>
+        <slot name="tips"></slot>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -42,6 +53,10 @@ export default {
     titleClass: {
       type: String,
       default: ''
+    },
+    position: {
+      type: String,
+      default: 'top'
     }
   },
   data() {

package/src/components/Table/index.vue

@@ -12,13 +12,13 @@
   >
     <template v-for="(item, i) in columns">
       <slot v-if="item.slotName" :name="item.slotName" :column="item"></slot>
-      <el-table-column v-else-if="item.render" :key="'cl-table-' + i" v-bind="item">
+      <el-table-column v-else-if="item.render" :key="'cl-table-column-render' + i" v-bind="item">
         <columnRender slot-scope="{ row, $index }" :c-render="item.render" :row="row" :index="$index" />
       </el-table-column>
 
       <el-table-column
         v-else
-        :key="'cl-table-' + i"
+        :key="'cl-table-column-' + i"
         :formatter="item.formatter | colfF(item.formatterMap)"
         :filters="item.filters | colftF(filtersMap)"
         v-bind="item"
@@ -29,7 +29,7 @@
   <ux-table
     v-else
     ref="ux-table"
-    :key="colsKey"
+    :key="'ux-table-' + colsKey"
     :header-cell-style="{ 'text-align': 'center' }"
     :data="data"
     :height="height"
@@ -54,7 +54,7 @@
 
       <ux-table-column
         v-else
-        :key="'cl-table-' + i"
+        :key="'cl-table-uxtable-' + i"
         :formatter="item.formatter | colf_BD_F(item.formatterMap)"
         :filters="item.filters | colft_BD_F(filtersMap)"
         :class-name="item | colKey"

package/src/components/TablePro/index.vue

@@ -49,15 +49,15 @@
           <template #header="{ $table, checked, indeterminate, disabled }">
             <span class="custom-checkbox" @click.stop="toggleAll($table, disabled)">
               <el-checkbox v-if="indeterminate" :key="key" :indeterminate="indeterminate" :disabled="disabled" />
-              <el-checkbox v-else-if="checked" :key="key" :value="checked" :disabled="disabled" />
-              <el-checkbox v-else :key="key" :value="checked" :disabled="disabled" />
+              <el-checkbox v-else-if="checked" :key="'checked-' + key" :value="checked" :disabled="disabled" />
+              <el-checkbox v-else :key="'unchecked-' + key" :value="checked" :disabled="disabled" />
             </span>
           </template>
           <template #checkbox="{ $table, row, checked, indeterminate, disabled }">
             <span class="custom-checkbox" @click.stop="toggleChecked($table, row, disabled)">
               <el-checkbox v-if="indeterminate" :key="key" :indeterminate="indeterminate" :disabled="disabled" />
-              <el-checkbox v-else-if="checked" :key="key" :value="checked" :disabled="disabled" />
-              <el-checkbox v-else :key="key" :value="checked" :disabled="disabled" />
+              <el-checkbox v-else-if="checked" :key="'checked-' + key" :value="checked" :disabled="disabled" />
+              <el-checkbox v-else :key="'unchecked-' + key" :value="checked" :disabled="disabled" />
             </span>
           </template>
         </vxe-column>
@@ -68,7 +68,7 @@
         >
           <vxe-column
             v-for="(subItem, i) in item.children"
-            :key="'vxe-table-' + i"
+            :key="'vxe-column-' + i"
             :formatter="subItem.formatter ? subItem.formatter : 'formatName'"
             :filters="subItem.filters"
             :filter-render="subItem.filterRender"
@@ -80,7 +80,7 @@
         </vxe-colgroup>
         <vxe-column
           v-else
-          :key="'vxe-table-' + i"
+          :key="'vxe-table-column-' + i"
           :class-name="`${item.wrap && `vxe-table-custom-wrap`} ${item.bold && `font-w600`}`"
           :formatter="item.formatter ? item.formatter : 'formatName'"
           :filters="item.filters"

package/src/plugins/Sign/sdca/index.js

@@ -69,5 +69,5 @@ export async function getSign(plain, dn) {
     Message.warning('当前Ukey不匹配！')
     throw new Error('当前Ukey不匹配！')
   }
-  return performSign(plainText + dn)
+  return performSign(plainText)
 }