agilebuilder-ui 1.1.15 → 1.1.16-tmp6

package/lib/{tab-content-iframe-index-94a31c76.js → tab-content-iframe-index-a43cac7b.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-5a2a6a90.js";
+import { _ as s } from "./index-2b8eabca.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-ee4f5cec.js → tab-content-index-133a2913.js}

@@ -1,4 +1,4 @@
-import { _ as v, c as $, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-5a2a6a90.js";
+import { _ as v, c as $, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-2b8eabca.js";
 import { resolveComponent as m, openBlock as l, createBlock as b, withCtx as g, createVNode as w, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as u, toDisplayString as y, createCommentVNode as f, normalizeClass as S } from "vue";
 const A = { class: "no-redirect" }, k = v({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);

package/lib/{tache-subprocess-history-5bbc0856.js → tache-subprocess-history-c7779e85.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-5a2a6a90.js";
+import { _ as I } from "./index-2b8eabca.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.15",
+  "version": "1.1.16-tmp6",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/super-grid/src/dynamic-input.vue

@@ -517,7 +517,7 @@ import apis from './apis'
 import ViewImageDialog from './view-image-dialog'
 import { $emit } from '../../utils/gogocodeTransfer'
 import eventBus from './eventBus'
-import { isMobileBrowser } from '../../../src/utils/common-util'
+import { isMobileBrowser, getAuthSource } from '../../../src/utils/common-util'
 import { analysisScanValue, setScanAnalysisValue } from './scan-util.ts'
 import customFormatter from './custom-formatter'
 export default {
@@ -648,8 +648,10 @@ export default {
       userAgent = 'browser'
     }
     console.log('superGrid----window.location.protocol---', window.location.protocol)
+    const isDingTalk = getAuthSource() === 'dingtalk' ? true : false
     const isApk = isMobile && userAgent && userAgent === 'app' ? true : false
-    const isShowScanIcon = isApk || (isMobile && scanEnable && window.location.protocol === 'https:' ? true : false)
+    const isShowScanIcon =
+      isApk || isDingTalk || (isMobile && scanEnable && window.location.protocol === 'https:' ? true : false)
 
     let baseURL = gridParams.options.backendUrl
     if (!baseURL) {
@@ -725,6 +727,7 @@ export default {
       scanEnable,
       userAgent,
       isApk,
+      isDingTalk,
       isShowBrowserScan: false,
       isShowScanIcon,
       baseURL,
@@ -1912,7 +1915,7 @@ export default {
     },
     scanClick() {
       console.log('scanClick----userAgent=', this.userAgent)
-      if (this.isApk) {
+      if (this.isApk || this.isDingTalk) {
         // 表示是APK中
         const message = {
           type: 'scan',
@@ -1920,6 +1923,9 @@ export default {
           systemCode: this.pageContext.systemCode,
           listCode: this.listCode
         }
+        if (this.isDingTalk) {
+          message.type = 'dingTalkScan'
+        }
         window.parent.postMessage(JSON.stringify(message), '*')
       } else {
         // 表示是移动端浏览器中

package/src/store/modules/user.js

@@ -10,7 +10,8 @@ import {
   setToken,
   removeProjectSettings,
   removeProjectCode,
-  setTheme
+  setTheme,
+  removeSystemCacheUrl
 } from '../../utils/auth'
 
 import {
@@ -205,6 +206,7 @@ const user = {
             removeDevpPermissions()
             removeProjectSettings()
             removeProjectCode()
+            removeSystemCacheUrl()
             resolve(data)
           })
           .catch((error) => {

package/src/utils/auth-api.js

@@ -178,10 +178,11 @@ function getSystemCacheUrlByCode(systemCode) {
 }
 
 function getSystemCacheUrl() {
-    let systemUrlJson = getCookieCache(currentSystemUrlKey)
-    if (!systemUrlJson) {
-        systemUrlJson = getSessionCache(currentSystemUrlKey)
-    }
+    // let systemUrlJson = getCookieCache(currentSystemUrlKey)
+    // if (!systemUrlJson) {
+    //     systemUrlJson = getSessionCache(currentSystemUrlKey)
+    // }
+    let systemUrlJson = localStorage.getItem(currentSystemUrlKey)
     if (systemUrlJson) {
         return JSON.parse(systemUrlJson)
     }
@@ -190,14 +191,16 @@ function getSystemCacheUrl() {
 function setSystemCacheUrl(systemUrlObj) {
     if (systemUrlObj) {
         const systemUrlStr = JSON.stringify(systemUrlObj)
-        setSessionCache(currentSystemUrlKey, systemUrlStr)
-        setCookieCache(currentSystemUrlKey, systemUrlStr)
+        localStorage.setItem(currentSystemUrlKey, systemUrlStr)
+        // setSessionCache(currentSystemUrlKey, systemUrlStr)
+        // setCookieCache(currentSystemUrlKey, systemUrlStr)
     }
 }
 
 function removeSystemCacheUrl() {
-    removeSessionCache(currentSystemUrlKey)
-    removeCookieCache(currentSystemUrlKey)
+    // removeSessionCache(currentSystemUrlKey)
+    // removeCookieCache(currentSystemUrlKey)
+    localStorage.removeItem(currentSystemUrlKey)
 }
 
 function getLanguage() {

package/src/utils/auth.js

@@ -143,6 +143,10 @@ export function removeProjectCode() {
   authApi.removeCookieCache('_PROJECT_CDOE')
 }
 
+export function removeSystemCacheUrl() {
+  authApi.removeSystemCacheUrl()
+}
+
 export function getRunCurrentRole() {
   let runCurrentRoleKey = '_RUN_CURRENT_ROLE'
   if(!isDevpSystem()){
@@ -160,4 +164,5 @@ export function clearPermission() {
 
   removeAllSystemPermissions()
   removePublishControl()
+  removeSystemCacheUrl()
 }

package/src/utils/common-util.js

@@ -546,25 +546,26 @@ async function handlePlateSysLang(currentLanguage) {
   }
 }
 
-export function setProjectSetting() {
-  const projectSettingCache = Cookies.get('PROJECT_SETTINGS')
-  let projectSettings = null
-  if (projectSettingCache) {
-    projectSettings = JSON.parse(projectSettingCache)
-    this.setLogoUrl(projectSettings)
-  } else {
-    this.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings').then((data) => {
-      Cookies.set('PROJECT_SETTINGS', JSON.stringify(data))
-      projectSettings = data
-    })
-  }
-  if (projectSettings.browserImageUuid) {
-    const linkElement = document.getElementById('ambBrowserIcon')
-    if (linkElement) {
-      linkElement.href = window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon'
-    }
-  }
-}
+// export function setProjectSetting() {
+//   const projectSettingCache = Cookies.get('PROJECT_SETTINGS')
+//   let projectSettings = null
+//   if (projectSettingCache) {
+//     projectSettings = JSON.parse(projectSettingCache)
+//    // TODO:工具方法中没有this，这个代码会报错，先注释该方法，没找到调用它的地方
+//     this.setLogoUrl(projectSettings)
+//   } else {
+//     window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings').then((data) => {
+//       Cookies.set('PROJECT_SETTINGS', JSON.stringify(data))
+//       projectSettings = data
+//     })
+//   }
+//   if (projectSettings.browserImageUuid) {
+//     const linkElement = document.getElementById('ambBrowserIcon')
+//     if (linkElement) {
+//       linkElement.href = window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon'
+//     }
+//   }
+// }
 
 // 动态加载css
 export function loadCSS() {
@@ -675,16 +676,8 @@ export function getCurrentSystemCode() {
 
 export function isLogoutTimeout(event) {
   let isTimeout = false
-  if (
-    event &&
-    typeof event.data === 'string' &&
-    event.data.indexOf('loginTimeout') >= 0
-  ) {
-    if (
-      event &&
-      typeof event.data === 'string' &&
-      event.data.indexOf('loginTimeout') >= 0
-    ) {
+  if (event && typeof event.data === 'string' && event.data.indexOf('loginTimeout') >= 0) {
+    if (event && typeof event.data === 'string' && event.data.indexOf('loginTimeout') >= 0) {
       // removeToken()
       // this.$router.replace({
       //   path: '/login'
@@ -694,3 +687,27 @@ export function isLogoutTimeout(event) {
   }
   return isTimeout
 }
+
+export function cacheSystemUrl() {
+  return new Promise((resolve, reject) => {
+    const systemUrls = window.$authApi.getSystemCacheUrl()
+    if (!systemUrls) {
+      window.$vueApp.config.globalProperties.$http
+        .get(window.$vueApp.config.globalProperties.baseAPI + '/component/business-systems/without-plate')
+        .then((urlMap) => {
+          if (urlMap) {
+            window.$authApi.setSystemCacheUrl(urlMap)
+          }
+          resolve()
+        })
+    } else {
+      resolve()
+    }
+  })
+}
+/**
+ * 登录源是哪种方式，例如：portal、dingtalk、weixin、mobile等
+ */
+export function getAuthSource() {
+  return window.localStorage.getItem('auth_source')
+}

package/src/utils/jump-page-utils.js

@@ -549,16 +549,57 @@ function getPageCode(jumpPageUrl) {
   }
   return pageCode
 }
+// 适配移动端跳转页面打开方式
+function refreshMobileDialogType(jumpPageSetting, isMobile) {
+  if (jumpPageSetting && isMobile) {
+    let openMode = jumpPageSetting.jumpPageMobileOpenMode
+    if (!openMode) {
+      if (jumpPageSetting.jumpPageOpenMode) {
+        // 表示没有配移动端打开方式，根据pc端打开方式适配移动端
+        openMode = jumpPageSetting.jumpPageOpenMode
+        if (openMode === 'newTab') {
+          // 移动端不支持新页签，适配为刷新区域
+          openMode = 'refresh'
+        }
+      } else {
+        // 表示没有配置任何打开方式，默认是刷新区域
+        openMode = 'refresh'
+      }
+    }
+    if (openMode === 'refresh') {
+      // 如果是刷新区域，则解析时为全屏抽屉
+      jumpPageSetting.dialogType = 'drawer'
+      jumpPageSetting.jumpPageWidth = '100%'
+      jumpPageSetting.isRefreshWhenClosePopup = true
+    }
+    jumpPageSetting.jumpPageMobileOpenMode = openMode
+    // if(!jumpPageSetting.jumpPageTitle){
+    //   jumpPageSetting.jumpPageTitle = 'QMS质量管理系统'
+    // }
+  }
+}
+
 // 使用页面组件内部调整
 function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, buttonCode, isHasIdParam, isMobile) {
   return new Promise((resolve, reject) => {
     // 表示是自定义系统跳转页面编码
     console.log('----jumpWithSuperPage---', jumpPageUrl, system, dataId, jumpPageSetting)
     const pageCode = getPageCode(jumpPageUrl)
-    let jumpMode = 'refresh'
-    if (jumpPageSetting && jumpPageSetting.jumpPageOpenMode) {
+    // 移动端newTab时更新页面打开方式为refresh
+    refreshMobileDialogType(jumpPageSetting, isMobile)
+    let jumpMode
+    if (isMobile && jumpPageSetting && jumpPageSetting.jumpPageMobileOpenMode) {
+      // 移动端时，获得移动端打开方式
+      jumpMode = jumpPageSetting.jumpPageMobileOpenMode
+    }
+    if(!jumpMode && jumpPageSetting) {
+      // 移动端没有配置则以 打开方式为准
       jumpMode = jumpPageSetting.jumpPageOpenMode
     }
+    if(!jumpMode){
+      // 默认是刷新页面
+      jumpMode = 'refresh'
+    }
     const jumpJsonData = {
       jumpMode: jumpMode
     }