agilebuilder-ui 1.1.45-ai2 → 1.1.46-sit1

package/packages/super-grid/src/row-operation.vue

@@ -1,10 +1,10 @@
 <template>
   <!--将@click改为@mousedown.native是因为操作列保存按钮时事件和input等组件的@blur冲突，导致保存需要保存两次，因为
       @blur先于@click执行的，所以只会执行@blur，@click就失效了，@mousedown是先于@blur执行的-->
-  <span :style="myStyle">
+  <span class="table-operation-row-btn" :style="myStyle">
     <template v-if="isShowButton()">
       <el-tooltip :disabled="tooltipDisabled" :content="label" placement="top">
-        <template v-if="operationSettingData.permission">
+        <template v-if="operationSettingData?.permission">
           <component
             v-bind="operationSettingData"
             :is="isElementType"
@@ -77,9 +77,13 @@ export default {
       type: String,
       default: null,
     },
+    operation: {
+      type: Object,
+      default: () => ({}),
+    },
     operationSetting: {
       type: Object,
-      default: null,
+      default: () => ({}),
     },
     operationIndex: {
       type: Number,
@@ -148,16 +152,16 @@ export default {
     },
     // 后置图标
     suffixIcon() {
-      if(['right'].includes(this.operationSettingData.iconPosition)) return this.operationSetting.iconValue
+      if(['right'].includes(this.operationSetting.iconPosition)) return this.operationSetting.iconValue
       return undefined
     },
     // 是否显示文字按钮 > 图标模式
     isTextIcon() {
       if (this.isTableBtnLinkShow) {
-        if (this.operationSettingData.isTextIcon === undefined) {
+        if (this.operationSetting.isTextIcon === undefined) {
           return this.isSaveRow || this.isDeleteRow || this.isEditRow || this.isRestoreRow
         }
-        return this.operationSettingData.isTextIcon
+        return this.operationSetting.isTextIcon
       } else {
         return false
       }
@@ -172,14 +176,14 @@ export default {
     },
     // 是否自动开启表格 按钮 转 文字按钮
     isTableBtnLinkShow() {
-      if (this.operationSetting.text) return true
+      if (this.operationSetting?.text) return true
       if (this.isTableBtnLink && this.elementType === 'el-button') {
-        return [this.operationSetting.text, this.operationSetting.plain, this.operationSetting.round].every(v => v === undefined)
+        return [this.operationSetting?.text, this.operationSetting?.plain, this.operationSetting?.round].every(v => v === undefined)
       }
       return false
     },
     operationSettingData() {
-      const dataList = { ...this.operationSetting }
+      const dataList = { ...(this.operationSetting ?? {}) }
       if (this.isTableBtnLinkShow) {
         dataList.underline = false
         delete dataList.text

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

@@ -1659,16 +1659,16 @@ export default {
       }
       return isCanRefreshTableData
     },
-    getSubTableGridData(subTableData) {
+    getSubTableGridData(subTableData, currentPage) {
       let gridData = subTableData
       if (this.isSubTableShowPage === true) {
         if (subTableData && subTableData.length > 0) {
           // const subTableData = JSON.parse(JSON.stringify(this.subTableData))
           this.pagination.total = subTableData.length
           // 当前是第几页
-          let currentPage = this.currentPage
-          if (currentPage === undefined || currentPage === null) {
-            currentPage = 1
+          let newCurrentPage = currentPage!== undefined && currentPage !== null ?currentPage: this.currentPage
+          if (newCurrentPage === undefined || newCurrentPage === null) {
+            newCurrentPage = 1
           }
           // 每页显示多少条记录
           let pageSize = this.pageSize
@@ -1679,7 +1679,7 @@ export default {
             pageSize = 20
           }
           // 当前页的第一条记录的数组下标
-          const startRowIndex = (currentPage - 1) * pageSize
+          const startRowIndex = (newCurrentPage - 1) * pageSize
           // 当前页的最后一条记录的数组下标
           let lastRowIndex = startRowIndex + pageSize
           if (subTableData.length > startRowIndex) {
@@ -2390,13 +2390,13 @@ export default {
         this.changePage()
       }
     },
-    changePage() {
+    changePage(currentPage) {
       console.log('点击了分页')
       // 翻页操作会导致筛选项发生变化，所以需要清空已有的
       this.$refs.superGrid?.clearFilter()
       // TODO: 把当前页数、每页条数、查询条件、排序信息传回后台
       if (this.isSubTableShowPage) {
-        this.gridData = this.getSubTableGridData(this.subTableData)
+        this.gridData = this.getSubTableGridData(this.subTableData, currentPage)
         const gridParams = store.get(this.code)
         gridParams.gridData = this.gridData
         // 完成深拷贝，复制一份对象，行编辑时使用

package/src/i18n/langs/cn.js

@@ -284,7 +284,9 @@ const cn = {
     theNumberOfUploadsExceedsTheLimitTheLimitIs: '上传数量超过限制,限制数量为',
     image: '图片',
     video: '视频',
-    updateSuccess: '更新成功'
+    updateSuccess: '更新成功',
+    more: '更多',
+    uploadFailed: '上传失败！'
   },
   messageVideo: {
     attemptingToIdentify: '正在尝试识别....',

package/src/i18n/langs/en.js

@@ -283,7 +283,9 @@ const en = {
     theNumberOfUploadsExceedsTheLimitTheLimitIs: 'The number of uploads exceeds the limit. The limit is',
     image: 'Image',
     video: 'Video',
-    updateSuccess: 'Update success'
+    updateSuccess: 'Update success',
+    more: 'More',
+    uploadFailed: '上传失败！'
   },
   messageVideo: {
     attemptingToIdentify: 'Attempting to identify',

package/src/styles/element-ui.scss

@@ -9,13 +9,14 @@
   display: none;
 }
 
-//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
-.el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-}
+//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 Dialog内select tree等组件在点击箭头时有虚晃
+// 去掉这个配置是因为margin: 0 auto;影响弹框位置，紧贴浏览器顶部，没有间距。例如：权限系统/授权管理/分支字段权限管理/新建按钮弹框
+// .el-dialog {
+//   transform: none;
+//   left: 0;
+//   position: relative;
+//   margin: 0 auto;
+// }
 
 //element ui upload
 .upload-container {

package/src/styles/index.scss

@@ -303,4 +303,23 @@ body .el-table colgroup.gutter {
 
 .dec-page-main {
   padding: var(--dec-page-main-padding, 15px);
+}
+
+// 必填背景色
+.required_bg {
+  background-color: #fff3e0 !important;
+  border-left: 4px solid #ff9800 !important;
+  padding: 10px;
+  display: block;
+}
+
+// 必填时右上角标样式
+.required-corner::after {
+  content: "*";
+  color: #e74c3c;
+  font-size: 18px;
+  font-weight: bold;
+  position: absolute;
+  top: 3px;
+  right: 5px;
 }

package/src/utils/common-util.js

@@ -231,8 +231,12 @@ export function isPlateSys(systemCode) {
 export function getServerConfigUtil(http) {
   return new Promise((resolve, reject) => {
     let timestamp = '1'
-    if(__BUILD_TIME__) {
-      timestamp = __BUILD_TIME__
+    try {
+      if(__BUILD_TIME__) {
+        timestamp = __BUILD_TIME__
+      }
+    } catch (error) {
+      console.log('__BUILD_TIME__ not define')
     }
     http.get('./server-config.json?t='+timestamp).then((result) => {
       const config = result
@@ -247,16 +251,60 @@ export function getServerConfigUtil(http) {
       )
       localStorage.setItem('_baseAPI_', window.$vueApp.config.globalProperties.baseAPI)
       localStorage.setItem('_amb_projectModel_', window.$vueApp.config.globalProperties.projectModel)
-      if (config.fontIconAddress && window.insertCssFile) {
-        window.insertCssFile(`${config.fontIconAddress}/iconfont.css?t=${timestamp}`)
-      }
-      if (config.fontIconAddress && window.insertCssFile) {
-        window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css?t=${timestamp}`)
-      }
+      // 插入图标css样式文件
+      insertFontIconCss(config)
+      // 第3方集成js
+      insertThirdLoginJs(config)
       resolve()
     })
   })
 }
+
+export function insertFontIconCss(config){
+  if(!window.insertCssFile){
+      return
+    }
+  if(!config){
+    config = window.$vueApp.config.globalProperties
+  }
+  let timestamp = '1'
+  try {
+    if(__BUILD_TIME__) {
+      timestamp = __BUILD_TIME__
+    }
+  } catch (error) {
+    console.log('__BUILD_TIME__ not define')
+  }
+  if (config.fontIconAddress && window.insertCssFile) {
+    window.insertCssFile(`${config.fontIconAddress}/iconfont.css?t=${timestamp}`)
+  }
+  if (config.fontIconAddress && window.insertCssFile) {
+    window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css?t=${timestamp}`)
+  }
+}
+
+export function insertThirdLoginJs(config){
+    if(!window.insertJsFile ){
+      return
+    }
+    if(!config){
+      config = window.$vueApp.config.globalProperties
+    }
+    if(!config  || (config.systemCode !== 'portal' && config.systemCode !== 'devp')){
+      return
+    }
+    // 只有portal和devp需要动态添加这些js
+    // userName,dingtalk,feishu,qiwei
+    if (!config.loginMethod || config.loginMethod.indexOf('dingtalk')>=0) {
+      window.insertJsFile(`https://g.alicdn.com/dingding/h5-dingtalk-login/0.21.0/ddlogin.js`)
+    }
+    if (!config.loginMethod || config.loginMethod.indexOf('feishu')>=0) {
+      window.insertJsFile(`https://lf-package-cn.feishucdn.com/obj/feishu-static/lark/passport/qrcode/LarkSSOSDKWebQRCode-1.0.3.js`)
+    }
+    if (!config.loginMethod || config.loginMethod.indexOf('qiwei')>=0) {
+      window.insertJsFile(`https://wwcdn.weixin.qq.com/node/open/js/wecom-jssdk-2.3.1.js`)
+    }
+}
 /**
  * postmessage跨域传message时获得orign路径使用
  * @returns orign路径

package/src/utils/insert_css.js

@@ -15,7 +15,6 @@ if (!window.insertCssFile) {
         if (!cssUrl || window.insertedCssFiles.has(cssUrl)) {
             return;
         }
-        const timestamp = new Date().getTime();
         const link = document.createElement('link');
         link.rel = 'stylesheet';
         link.href = cssUrl;
@@ -29,6 +28,20 @@ if (!window.insertCssFile) {
     }
 }
 
+
+if (!window.insertJsFile) {
+    window.insertJsFile = (jsUrl) => {
+        if (!jsUrl || window.insertedCssFiles.has(jsUrl)) {
+            return;
+        }
+        const link = document.createElement('script');
+        link.src = jsUrl;
+        link.onload = function () {
+            window.insertedCssFiles.add(jsUrl);
+        };
+        document.head.appendChild(link);
+    }
+}
 // if (window.insertCssFile) {
 //     window.insertCssFile(window.defaultCssUrl);
 // }

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

@@ -73,6 +73,7 @@ export function initialization(
           if (jumpPageResult && jumpPageResult.visible) {
             const res = { ...jumpPageResult }
             res.jumpPageSetting = JSON.stringify(jumpPageItem.jumpPageSetting)
+            res.jumpPageItem = jumpPageItem
             return res
           }
         }
@@ -228,7 +229,10 @@ export function jumpToPage(
     }
     getSystem(system, jumpPageSetting.jumpPageUrl, jumpPageSetting.isNewPage, jumpPageSetting)
       .then((system) => {
-        if ((jumpPageSetting.jumpPageAdditional && jumpPageSetting.jumpPageAdditional.length > 0) || (jumpPageSetting.jumpPageTitle && jumpPageSetting.jumpPageTitle.indexOf('${')>=0)) {
+        if (
+          (jumpPageSetting.jumpPageAdditional && jumpPageSetting.jumpPageAdditional.length > 0) ||
+          (jumpPageSetting.jumpPageTitle && jumpPageSetting.jumpPageTitle.indexOf('${') >= 0)
+        ) {
           // 发送请求，获取附加参数，并存入缓存
           const paramPath =
             window.$vueApp.config.globalProperties.baseAPI + '/component/super-pages/parsing-additional-parameters'
@@ -242,7 +246,7 @@ export function jumpToPage(
           if (!pageData) {
             pageData = {}
           }
-          if(!additionalParamMap){
+          if (!additionalParamMap) {
             additionalParamMap = {}
           }
           Object.assign(additionalParamMap, pageData)
@@ -593,11 +597,11 @@ function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, bu
       // 移动端时，获得移动端打开方式
       jumpMode = jumpPageSetting.jumpPageMobileOpenMode
     }
-    if(!jumpMode && jumpPageSetting) {
+    if (!jumpMode && jumpPageSetting) {
       // 移动端没有配置则以 打开方式为准
       jumpMode = jumpPageSetting.jumpPageOpenMode
     }
-    if(!jumpMode){
+    if (!jumpMode) {
       // 默认是刷新页面
       jumpMode = 'refresh'
     }