n20-common-lib 2.22.69 → 2.22.70

package/package.json

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

package/src/components/ApprovalButtons/getApprovalConfig.js

@@ -0,0 +1,87 @@
+import getJsonc from '../../assets/getJsonc.js'
+import axios from '../../utils/axios'
+
+const DYNAMIC_CONFIG_URL = '/bems/portal/sysAppConfig/listAllConfig'
+const DYNAMIC_CONFIG_QUERY = {
+  systemNos: ['BEMS'],
+  menuNos: ['BG_CONFIG'],
+  moduleNos: ['activiti'],
+  groupNos: [],
+  configKeys: []
+}
+
+let backendConfigPromise
+
+function parseConfigValue(value) {
+  if (typeof value !== 'string') return value
+  try {
+    return JSON.parse(value)
+  } catch (error) {
+    return value
+  }
+}
+
+function setConfigValue(target, path, value) {
+  path.reduce((current, key, index) => {
+    if (index === path.length - 1) {
+      current[key] = value
+      return current
+    }
+    if (!current[key] || typeof current[key] !== 'object') {
+      current[key] = {}
+    }
+    return current[key]
+  }, target)
+}
+
+function decodeConfigList(base64) {
+  if (!base64) return []
+  const binary = window.atob(base64)
+  const bytes = Uint8Array.from(binary, (char) => char.charCodeAt(0))
+  const configList = JSON.parse(new TextDecoder('utf-8').decode(bytes))
+  return Array.isArray(configList) ? configList : []
+}
+
+function mergeConfigList(configList) {
+  return configList.reduce((config, item) => {
+    if (!item || !item.configKey) return config
+    setConfigValue(config, item.configKey.split('.'), parseConfigValue(item.configValue))
+    return config
+  }, {})
+}
+
+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 : {})
+      }
+    })()
+  }
+
+  try {
+    return await backendConfigPromise
+  } catch (error) {
+    // 接口不可用时不缓存失败结果，后续组件实例仍可重新探测新配置接口。
+    backendConfigPromise = undefined
+    throw error
+  }
+}
+
+/**
+ * 优先读取后台管理配置，低版本门户未提供接口时回退 JSONC。
+ * @returns {Promise<Object>}
+ */
+export default async function getApprovalConfig() {
+  try {
+    return await getBackendConfig()
+  } catch (error) {
+    return getJsonc('portal/server-config.jsonc', null, true)
+  }
+}

package/src/components/ApprovalButtons/index.vue

@@ -341,6 +341,7 @@
 <script>
 import selectSpr from './selectSpr.vue'
 import getJsonc from '../../assets/getJsonc.js'
+import getApprovalConfig from './getApprovalConfig'
 import { closeTagsForBackPage } from '../../plugins/CompatibleOld'
 import axios from '../../utils/axios'
 import { $lc } from '../../utils/i18n/index'
@@ -642,21 +643,19 @@ export default {
       }
     },
     // 意见是否必填
-    getConfiguration() {
-      getJsonc('portal/server-config.jsonc', null, true)
-        .then(({ opinionRequired, showApproveTo }) => {
-          this.requiredC = opinionRequired ?? this.required
-          this.showApproveTo = showApproveTo ?? true
-        })
-        .catch(() => {
-          this.requiredC = this.required
-        })
-        .finally(() => {
-          // 读取该工作流是否意见必填
-          if (this.$route.query.remarkIsMust !== undefined) {
-            this.requiredC = this.$route.query.remarkIsMust === '1'
-          }
-        })
+    async getConfiguration() {
+      try {
+        const { opinionRequired, showApproveTo } = await getApprovalConfig()
+        this.requiredC = opinionRequired ?? this.required
+        this.showApproveTo = showApproveTo ?? true
+      } catch (error) {
+        this.requiredC = this.required
+      } finally {
+        // 工作流节点配置优先于全局审批意见必填配置。
+        if (this.$route.query.remarkIsMust !== undefined) {
+          this.requiredC = this.$route.query.remarkIsMust === '1'
+        }
+      }
     },
     getTodoList() {
       return new Promise((resolve) => {

package/src/components/DatePicker/index.vue

@@ -150,10 +150,6 @@ export default {
   display: inline-block;
 }
 
-.n20-date-picker > .n20-date-editor {
-  width: 100%;
-}
-
 .n20-date-picker.has-long-term {
   display: inline-flex;
   align-items: center;
@@ -161,7 +157,6 @@ export default {
 
 .n20-date-picker.has-long-term > .n20-date-editor {
   flex: 1;
-  width: auto;
   min-width: 0;
 }