n20-common-lib 2.9.10 → 2.9.11

package/package.json

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

package/src/components/DynamicField/DynamicTable.vue

@@ -13,13 +13,13 @@
         :prop="`${listName}.` + $rowIndex + `.${column.prop}`"
         :rules="[
           {
-            required: column.requiredFlag || row[column.prop] + '_requiredFlag',
+            required: column.requiredFlag,
             message: ` `,
             trigger: ['change', 'blur']
           }
         ]"
       >
-        <slot :name="column.prop" :column="column" :rowIndex="$rowIndex"></slot>
+        <slot :row="row" :name="column.prop" :column="column" :rowIndex="$rowIndex"></slot>
       </el-form-item>
     </vxe-column>
     <!--判断字段输入类型 如：input元素、select元素-->
@@ -36,7 +36,7 @@
         :prop="`${listName}.` + $rowIndex + `.${column.prop}`"
         :rules="[
           {
-            required: column.requiredFlag || row[column.prop] + '_requiredFlag' || row[column.prop] + '_requiredFlag',
+            required: column.requiredFlag,
             message: ` `,
             trigger: ['change', 'blur']
           }
@@ -69,7 +69,7 @@
         :prop="`${listName}.` + $rowIndex + `.${column.prop}`"
         :rules="[
           {
-            required: column.requiredFlag || row[column.prop] + '_requiredFlag',
+            required: column.requiredFlag,
             message: ` `,
             trigger: ['change', 'blur']
           }
@@ -99,7 +99,7 @@
         :prop="`${listName}.` + $rowIndex + `.${column.prop}`"
         :rules="[
           {
-            required: column.requiredFlag || row[column.prop] + '_requiredFlag',
+            required: column.requiredFlag,
             message: ` `,
             trigger: ['change', 'blur']
           }
@@ -151,7 +151,7 @@
         :prop="`${listName}.` + $rowIndex + `.${column.prop}`"
         :rules="[
           {
-            required: column.requiredFlag || row[column.prop] + '_requiredFlag',
+            required: column.requiredFlag,
             message: ` `,
             trigger: ['change', 'blur']
           }
@@ -203,7 +203,7 @@
         :prop="`${listName}.` + $rowIndex + `.${column.prop}`"
         :rules="[
           {
-            required: column.requiredFlag || row[column.prop] + '_requiredFlag',
+            required: column.requiredFlag,
             message: ` `,
             trigger: ['change', 'blur']
           }
@@ -239,7 +239,7 @@
         :prop="`${listName}.` + $rowIndex + `.${column.prop}`"
         :rules="[
           {
-            required: column.requiredFlag || row[column.prop] + '_requiredFlag',
+            required: column.requiredFlag,
             message: ` `,
             trigger: ['change', 'blur']
           }
@@ -272,7 +272,7 @@
         :prop="`${listName}.` + $rowIndex + `.${column.prop}`"
         :rules="[
           {
-            required: column.requiredFlag || row[column.prop] + '_requiredFlag',
+            required: column.requiredFlag,
             message: ` `,
             trigger: ['change', 'blur']
           }

package/src/components/ElectronicArchive/index.vue

@@ -49,8 +49,8 @@
                 v-model="row[keys.bussType]"
                 :disabled="row._bussTypeDisabled || row.readonly"
                 :placeholder="'请选择' | $lc"
-                @change="(val) => bussTypeChange(val, row)"
                 style="width: 100%"
+                @change="(val) => bussTypeChange(val, row)"
               >
                 <el-option
                   v-for="item in bussTypeOptions"
@@ -122,17 +122,17 @@
           <template v-slot="{ row, $index }">
             <slot name="upload" :row="row" :[indexKey]="$index">
               <el-input
+                v-if="row.isBaseFile"
                 :value="row._name"
                 :placeholder="'上传附件' | $lc"
                 readonly
                 :disabled="!row[keys.type] || row._name"
-                v-if="row.isBaseFile"
                 @click.native.stop="handleClick(row, $index)"
               >
                 <template slot="prefix">
                   <i
-                    v-title="`附件已禁用`"
                     v-if="row.isEnable === '0'"
+                    v-title="`附件已禁用`"
                     class="el-input__icon n20-icon-yichu color-danger"
                   ></i>
                 </template>
@@ -222,8 +222,8 @@
         <template v-slot="{ row }">
           <slot name="handle" :row="row">
             <el-button
-              type="text"
               v-title="!officeStatus ? `缺少插件` : '预览'"
+              type="text"
               :icon="!officeStatus ? 'n20-icon-yanjing' : 'el-icon-view'"
               :disabled="!row[keys.url]"
               @click="seeFile(row)"
@@ -279,7 +279,7 @@
       >
         <el-table-column label="选择" align="center" width="65">
           <template scope="scope">
-            <el-radio :label="scope.$index" v-model="radio" @change.native="getCurrentRow(scope.row)"
+            <el-radio v-model="radio" :label="scope.$index" @change.native="getCurrentRow(scope.row)"
               >{{ '' }}
             </el-radio>
           </template>
@@ -288,7 +288,7 @@
         <el-table-column prop="cltName" width="140px" show-overflow-tooltip label="所属单位" />
         <el-table-column prop="fileVersion" align="center" label="版本号" />
         <el-table-column prop="startValidTime" width="120px" label="起始有效时间" align="center" />
-        <el-table-column prop="endValidTime" width="120px" label="截至有效时间" align="center"></el-table-column>
+        <el-table-column prop="endValidTime" width="120px" label="截至有效时间" align="center" />
         <el-table-column prop="uploadTime" label="更新时间" width="160px" align="center">
           <template v-slot="{ row }">
             {{ dayjs(row.uploadTime).format('YYYY-MM-DD HH:mm:ss') }}
@@ -468,6 +468,20 @@ export default {
       officeStatus: false
     }
   },
+  computed: {
+    keys() {
+      return this.dataProp?.keys || keysDefault
+    },
+    fileAccept() {
+      return this.dataPorp?.fileAccept || undefined
+    },
+    fileSize() {
+      return this.dataPorp?.fileSize || undefined
+    },
+    fileData() {
+      return this.dataPorp?.fileData
+    }
+  },
   watch: {
     tableData: {
       handler(data) {
@@ -486,20 +500,6 @@ export default {
       }
     }
   },
-  computed: {
-    keys() {
-      return this.dataProp?.keys || keysDefault
-    },
-    fileAccept() {
-      return this.dataPorp?.fileAccept || undefined
-    },
-    fileSize() {
-      return this.dataPorp?.fileSize || undefined
-    },
-    fileData() {
-      return this.dataPorp?.fileData
-    }
-  },
   filters: {
     formatDate(date) {
       if (!date) return

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

@@ -50,8 +50,8 @@ function getUserCert(uno) {
   try {
     axios.post(`/bems/prod_1.0/dssc/sign/updateCert_direct/${uno}`).then(({ code, data }) => {
       if (code === 200) {
-        // 设置提供者
-        IWSA_rsa_csp_setProvider(data.certProvider)
+        // 设置提供者 Microsoft Base Cryptographic Provider v1.0
+        IWSA_rsa_csp_setProvider('Microsoft Base Cryptographic Provider v1.0')
         // 设置同步模式
         IWSASetAsyncMode(false)
         let alg = data.alg === 'RSA_1024' ? '1024' : ata.alg === 'RSA_2048' ? '2048' : '1024'