n20-common-lib 3.3.2 → 3.3.3

package/package.json

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

package/src/components/ApprovalButtons/getApprovalConfig.js

@@ -10,8 +10,6 @@ const DYNAMIC_CONFIG_QUERY = {
   configKeys: []
 }
 
-let backendConfigPromise
-
 function parseConfigValue(value) {
   if (typeof value !== 'string') return value
   try {
@@ -51,27 +49,19 @@ function mergeConfigList(configList) {
 }
 
 async function getBackendConfig() {
-  if (!backendConfigPromise) {
-    backendConfigPromise = (async () => {
-      const { data } = await axios.post(DYNAMIC_CONFIG_URL, DYNAMIC_CONFIG_QUERY, {
-        loading: false,
-        noMsg: true
-      })
-      const config = mergeConfigList(decodeConfigList(data))
-      return {
-        ...config,
-        ...(config.nstc && config.nstc.activiti ? config.nstc.activiti : {})
-      }
-    })()
+  const { data } = await axios.post(DYNAMIC_CONFIG_URL, DYNAMIC_CONFIG_QUERY, {
+    loading: false,
+    noMsg: true
+  })
+  const config = mergeConfigList(decodeConfigList(data))
+  return {
+    ...config,
+    ...(config.nstc && config.nstc.activiti ? config.nstc.activiti : {})
   }
+}
 
-  try {
-    return await backendConfigPromise
-  } catch (error) {
-    // 接口不可用时不缓存失败结果，后续组件实例仍可重新探测新配置接口。
-    backendConfigPromise = undefined
-    throw error
-  }
+export function isApprovalRequired(value) {
+  return value === true || value === 1 || value === '1' || value === 'true'
 }
 
 /**

package/src/components/ApprovalButtons/index.vue

@@ -2,20 +2,24 @@
 <template>
   <div :class="prefixCls">
     <!-- 自定义项 -->
-    <ExpandablePane
-      v-if="taskId && showBtn && authList.includes('isShowOtherAtt')"
-      :title="$lc('自定义项')"
-      :default-expand="otherExpand"
-    >
-      <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
-        <div
-          class="p-b-lg p-t-lg p-r-lg"
-          style="max-height: 150px; overflow-y: auto; border: 1px dashed var(--border-color-base); border-radius: 5px"
-        >
-          <show-other-att-new ref="showOtherAttNew" :task-id="taskId" :form="customizationDtos" :required="true" />
-        </div>
-      </el-form>
-    </ExpandablePane>
+    <template v-if="taskId && showBtn">
+      <ExpandablePane v-show="shouldShowCustomization" :title="$lc('自定义项')" :default-expand="otherExpand">
+        <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
+          <div
+            class="p-b-lg p-t-lg p-r-lg"
+            style="max-height: 150px; overflow-y: auto; border: 1px dashed var(--border-color-base); border-radius: 5px"
+          >
+            <show-other-att-new
+              ref="showOtherAttNew"
+              :task-id="taskId"
+              :form="customizationDtos"
+              :required="true"
+              @loaded="showCustomItem = $event"
+            />
+          </div>
+        </el-form>
+      </ExpandablePane>
+    </template>
 
     <div class="n20-form-expandable-pane n20-approve-title">
       <div class="n20-title flex-box flex-lr flex-v" :class="titleClass">
@@ -349,7 +353,7 @@ import ShowAppOpi from './showAppOpi.vue'
 import ShowOtherAtt from './showOtherAttr.vue'
 import ShowOtherAttNew from './showOtherAttrNew.vue'
 import { toExaminePath } from './specialHandle'
-import getApprovalConfig from './getApprovalConfig'
+import getApprovalConfig, { isApprovalRequired } from './getApprovalConfig'
 
 import getJsonc from '../../assets/getJsonc.js'
 import { closeTagsForBackPage } from '../../plugins/CompatibleOld'
@@ -532,6 +536,10 @@ export default {
     }
   },
   computed: {
+    // 兼容历史流程：权限标识缺失时，以任务实际返回的自定义项作为展示和提交依据
+    shouldShowCustomization() {
+      return this.authList.includes('isShowOtherAtt') || this.showCustomItem
+    },
     messageC: {
       get() {
         return this.msgisSync ? this.message : this.messageIn
@@ -567,6 +575,13 @@ export default {
     this.getConfiguration()
     this.getIsShowUploadWidget()
   },
+  activated() {
+    if (!this._canRefreshConfiguration) return
+    this.getConfiguration()
+  },
+  deactivated() {
+    this._canRefreshConfiguration = true
+  },
   methods: {
     // 查询选择审批人
     async showAdvancePop() {
@@ -646,18 +661,19 @@ export default {
     },
     // 意见是否必填
     async getConfiguration() {
+      let opinionRequired = false
       try {
-        const { opinionRequired, showApproveTo } = await getApprovalConfig()
-        this.requiredC = opinionRequired ?? this.required
+        const approvalConfig = await getApprovalConfig()
+        opinionRequired = approvalConfig.opinionRequired
+        const { showApproveTo } = approvalConfig
         this.showApproveTo = showApproveTo ?? true
       } catch (error) {
-        this.requiredC = this.required
-      } finally {
-        // 工作流节点配置优先于全局审批意见必填配置。
-        if (this.$route.query.remarkIsMust !== undefined) {
-          this.requiredC = this.$route.query.remarkIsMust === '1'
-        }
+        // 配置接口与 JSONC 均不可用时沿用组件默认值。
       }
+      // 业务属性、全局配置、工作流节点配置任一开启时，审批意见均为必填。
+      this.requiredC = Boolean(
+        this.required || isApprovalRequired(opinionRequired) || this.$route.query.remarkIsMust === '1'
+      )
     },
     getTodoList() {
       return new Promise((resolve, reject) => {
@@ -789,7 +805,7 @@ export default {
     getParam() {
       let { typeCode, taskId, groupNo, isAgentcy, isCheck } = this.$route.query
       let customizationDtos
-      if (this.authList.includes('isShowOtherAtt')) {
+      if (this.shouldShowCustomization) {
         customizationDtos = this.$refs['showOtherAttNew']?.getOtherAttData()
       }
       return [

package/src/components/ApprovalButtons/indexApp.vue

@@ -2,20 +2,24 @@
 <template>
   <div :class="prefixCls">
     <!-- 自定义项 -->
-    <ExpandablePane
-      v-if="taskId && showBtn && authList.includes('isShowOtherAtt')"
-      :title="$lc('自定义项')"
-      :default-expand="false"
-    >
-      <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
-        <div
-          class="p-b-lg p-t-lg p-r-lg"
-          style="max-height: 150px; overflow-y: auto; border: 1px dashed var(--border-color-base); border-radius: 5px"
-        >
-          <show-other-att-new ref="showOtherAttNew" :task-id="taskId" :form="customizationDtos" :required="true" />
-        </div>
-      </el-form>
-    </ExpandablePane>
+    <template v-if="taskId && showBtn">
+      <ExpandablePane v-show="shouldShowCustomization" :title="$lc('自定义项')" :default-expand="false">
+        <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
+          <div
+            class="p-b-lg p-t-lg p-r-lg"
+            style="max-height: 150px; overflow-y: auto; border: 1px dashed var(--border-color-base); border-radius: 5px"
+          >
+            <show-other-att-new
+              ref="showOtherAttNew"
+              :task-id="taskId"
+              :form="customizationDtos"
+              :required="true"
+              @loaded="showCustomItem = $event"
+            />
+          </div>
+        </el-form>
+      </ExpandablePane>
+    </template>
     <!-- <div class="n20-form-expandable-pane">
       <div class="n20-title flex-box flex-lr flex-v" :class="titleClass">
         <span class="n20-tips flex-item">
@@ -326,6 +330,7 @@
 <script>
 import selectSpr from './selectSpr.vue'
 import getJsonc from '../../assets/getJsonc.js'
+import getApprovalConfig, { isApprovalRequired } from './getApprovalConfig'
 import { closeTagsForBackPage } from '../../plugins/CompatibleOld'
 import axios from '../../utils/axios'
 import { $lc } from '../../utils/i18n/index'
@@ -507,6 +512,10 @@ export default {
     }
   },
   computed: {
+    // 兼容历史流程：权限标识缺失时，以任务实际返回的自定义项作为展示和提交依据
+    shouldShowCustomization() {
+      return this.authList.includes('isShowOtherAtt') || this.showCustomItem
+    },
     messageC: {
       get() {
         return this.msgisSync ? this.message : this.messageIn
@@ -539,9 +548,16 @@ export default {
     this.getShowApprovalTo()
     this.getHasQueryAppOpiAndUser()
     this.nextApproval && this.getTodoList()
-    //this.getConfiguration()
+    this.getConfiguration()
     this.getIsShowUploadWidget()
   },
+  activated() {
+    if (!this._canRefreshConfiguration) return
+    this.getConfiguration()
+  },
+  deactivated() {
+    this._canRefreshConfiguration = true
+  },
   methods: {
     // 查询选择审批人
     async showAdvancePop() {
@@ -576,22 +592,18 @@ export default {
       console.log(code, data)
     },
     // 意见是否必填
-    getConfiguration() {
-      getJsonc('portal/server-config.jsonc', null, true)
-        .then(({ opinionRequired }) => {
-          this.requiredC = opinionRequired ?? this.required
-          // 读取该工作流是否意见必填
-          if (this.$route.query.remarkIsMust !== undefined) {
-            this.requiredC = this.$route.query.remarkIsMust === '1'
-          }
-        })
-        .catch(() => {
-          this.requiredC = this.required
-          // 读取该工作流是否意见必填
-          if (this.$route.query.remarkIsMust !== undefined) {
-            this.requiredC = this.$route.query.remarkIsMust === '1'
-          }
-        })
+    async getConfiguration() {
+      let opinionRequired = false
+      try {
+        const approvalConfig = await getApprovalConfig()
+        opinionRequired = approvalConfig.opinionRequired
+      } catch (error) {
+        // 配置接口与 JSONC 均不可用时沿用组件默认值。
+      }
+      // 业务属性、全局配置、工作流节点配置任一开启时，审批意见均为必填。
+      this.requiredC = Boolean(
+        this.required || isApprovalRequired(opinionRequired) || this.$route.query.remarkIsMust === '1'
+      )
     },
     getTodoList() {
       return new Promise((resolve, reject) => {
@@ -721,7 +733,7 @@ export default {
     getParam() {
       let { typeCode, taskId, groupNo, isAgentcy, isCheck } = this.$route.query
       let customizationDtos
-      if (this.authList.includes('isShowOtherAtt')) {
+      if (this.shouldShowCustomization) {
         customizationDtos = this.$refs['showOtherAttNew']?.getOtherAttData()
       }
       return [

package/src/components/ApprovalButtons/showOtherAttrNew.vue

@@ -143,22 +143,30 @@ export default {
       if (data.length) {
         this.otherAttData = data
       }
+      this.$emit('loaded', this.otherAttData.length > 0)
       if (this.taskId) {
-        axios.post(`/bems/admin/customization/${this.taskId}`, null, { loading: false }).then(({ data }) => {
-          if (data && data.length) {
-            this.otherAttData =
-              data?.map((item) => {
-                if (['32'].includes(item.cfgType)) {
-                  item.checkList = item.checkList ? item.checkList : []
-                }
-                if (['31'].includes(item.cfgType)) {
-                  item.selectList = item.selectList ? item.selectList : []
-                }
-                this.setDefaultValue(item)
-                return item
-              }) || []
-          }
-        })
+        axios
+          .post(`/bems/admin/customization/${this.taskId}`, null, { loading: false })
+          .then(({ data }) => {
+            if (data && data.length) {
+              this.otherAttData =
+                data?.map((item) => {
+                  if (['32'].includes(item.cfgType)) {
+                    item.checkList = item.checkList ? item.checkList : []
+                  }
+                  if (['31'].includes(item.cfgType)) {
+                    item.selectList = item.selectList ? item.selectList : []
+                  }
+                  this.setDefaultValue(item)
+                  return item
+                }) || []
+            }
+            this.$emit('loaded', this.otherAttData.length > 0)
+          })
+          .catch(() => {
+            // 接口不可用时保留传入数据和原权限标识逻辑，不阻断普通审批
+            this.$emit('loaded', this.otherAttData.length > 0)
+          })
       }
     },
     changeFn(val, item) {