agilebuilder-ui 1.1.11 → 1.1.12-tmp2

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-app.vue

@@ -156,7 +156,7 @@ const emits = defineEmits(['remove', 'uploadend'])
 
 // 表示点击了选择文件按钮
 function pickBrowserFiles() {
-  // console.log('---点击了选择文件按钮---')
+  console.log('---点击了选择文件按钮---')
   const message = {
     type: 'pickFiles',
     multiple: props.multiple,
@@ -167,12 +167,18 @@ function pickBrowserFiles() {
     listCode: props.listCode
   }
   if(window.parent && window.parent.parent && window.parent.parent.parent ) {
+  console.log('---点击了选择文件按钮111---')
+  message.myCustom = 'window.parent.parent.parent'
     // 加上uniapp中的iframe，一共是4层iframe嵌套时.最多支持4层iframe嵌套。
     window.parent.parent.parent.postMessage(JSON.stringify(message), '*')
   } else if(window.parent && window.parent.parent) {
+  console.log('---点击了选择文件按钮222---')
+  message.myCustom = 'window.parent.parent'
     // 加上uniapp中的iframe，一共是3层iframe嵌套时
     window.parent.parent.postMessage(JSON.stringify(message), '*')
   } else {
+  console.log('---点击了选择文件按钮444---')
+  message.myCustom = 'window.parent'
     window.parent.postMessage(JSON.stringify(message), '*')
   }
 }

package/packages/organization-input/src/organization-input.vue

@@ -1,5 +1,5 @@
 <template>
-  <span style="width: 100%">
+  <span style="width: 100%" class="organization-input">
     <template v-if="disabled">
       <el-input
         :disabled="true"
@@ -221,7 +221,7 @@ export default {
     getPropName(prop, isJoinTable, tableName) {
       if (prop && prop.startsWith('${')) {
         // 格式是：${page.xxx} 或 ${data.xxx}
-        prop = prop.substring(prop.indexOf('.')+1, prop.length - 1)
+        prop = prop.substring(prop.indexOf('.') + 1, prop.length - 1)
       }
       return getPropNameWhenJoinTable(prop, isJoinTable, tableName)
     },
@@ -296,7 +296,7 @@ export default {
     },
     getModelValue(model, propType) {
       let models = this.models
-      if(propType && propType === 'page') {
+      if (propType && propType === 'page') {
         models = this.pageModels
       }
       let modelValue = ''
@@ -305,8 +305,8 @@ export default {
         modelValue = parentObj[model.substring(model.lastIndexOf('.') + 1)]
       } else {
         const name = this.getPropName(model)
-        if(propType && propType === 'page') {
-          modelValue = models?models[name]: null
+        if (propType && propType === 'page') {
+          modelValue = models ? models[name] : null
         } else {
           modelValue = models[name]
         }
@@ -520,11 +520,11 @@ export default {
       }
     },
     setValue(model, finallyOrgResult, propType) {
-      if(!propType) {
-          propType = this.getPropType(model)
+      if (!propType) {
+        propType = this.getPropType(model)
       }
       let models = this.models
-      if(propType && propType === 'page') {
+      if (propType && propType === 'page') {
         models = this.pageModels
       }
       this.setEntityValue(model, finallyOrgResult, models)
@@ -579,3 +579,8 @@ export default {
   emits: ['replace', 'setValue', 'clear', 'focus', 'update:value', 'change']
 }
 </script>
+<style lang="css">
+.organization-input .el-input-group__append {
+  padding: 0 10px;
+}
+</style>

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

@@ -1022,15 +1022,26 @@ export default {
         }
       }
     },
+    orgTreeSetSort() {
+      // 设值排下序，否则出现所有映射还没设值完毕，就触发了change事件问题
+      const columnPropIndex = this.fields.findIndex((filed) => filed.model === this.column.prop)
+      if (columnPropIndex > -1) {
+        const tempFiled = this.fields[columnPropIndex]
+        this.fields.splice(columnPropIndex, 1)
+        this.fields.push(tempFiled)
+      }
+    },
     // 显示组织树时需要计算指定部门
     showOrganizationTree() {
       if (this.column.orgTreeSet) {
         const orgTreeSet = JSON.parse(this.column.orgTreeSet)
         if (orgTreeSet.length) {
           this.fields = orgTreeSet
+          this.orgTreeSetSort()
         } else {
           if (orgTreeSet.orgTreeSetArr) {
             this.fields = orgTreeSet.orgTreeSetArr
+            this.orgTreeSetSort()
           }
           if (orgTreeSet.specifyType) {
             if (orgTreeSet.specifyType === 'dataTable') {

package/packages/super-grid/src/super-grid-service.js

@@ -176,6 +176,7 @@ const superGridService = {
                 gridParams.pagination = this.pagination
                 gridParams.pageContext = this.pageContext
                 gridParams.configureObj = this.configureObj
+                this.tableName = this.basicInfo.tableName
                 gridParams.hiddenColumns = this.options.hiddenColumns?JSON.parse(JSON.stringify(this.options.hiddenColumns)):[]
                 if (this.pagination) {
                   // 监控每行显示多少条变量使用

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

@@ -2164,7 +2164,8 @@ export default {
     },
     getSearchParam() {
       const searchParam = {
-        code: this.code
+        code: this.code,
+        tableName: this.tableName
       }
       const gridParams = store.get(this.code)
       const pagination = this.getPaginationInfo()

package/packages/workgroup-tree/src/workgroup-tree.vue

@@ -3,6 +3,8 @@
 		<WorkgroupMobileTree
 			v-if="isMobile"
 			ref="workgroupTree"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
 			:branch-info="branchInfo"
 			:multiple="multiple"
 			:search-field="searchField"

package/packages/workgroup-user-tree/src/workgroup-user-tree.vue

@@ -2,6 +2,8 @@
 	<div>
 		<WorkgroupMobileUserTree
 			v-if="isMobile"
+			:close-on-click-modal="false"
+			:close-on-press-escape="false"
 			:multiple="multiple"
 			:branch-info="branchInfo"
 			:search-field="searchField"

package/src/styles/index.scss

@@ -199,4 +199,36 @@ body .el-table colgroup.gutter {
   text-align: center;
   vertical-align: middle;
   justify-content: center;
+}
+
+
+/* 分隔组件 */
+.amb-widget-separatelabel {
+  --el-card-border-color: var(--el-border-color-light);
+  --el-card-border-radius: 4px;
+  --el-card-padding: 20px;
+  --el-card-bg-color: var(--el-fill-color-blank);
+  background-color: var(--el-card-bg-color);
+  /* border: 1px solid var(--el-card-border-color); */
+  border-bottom: 1px solid var(--el-card-border-color);
+  border-radius: var(--el-card-border-radius);
+  color: var(--el-text-color-primary);
+  overflow: hidden;
+  transition: var(--el-transition-duration);
+  /* box-shadow: var(--el-box-shadow-light); */
+  padding: 10px;
+  padding-left: 0px;
+  margin-bottom: 18px;
+}
+
+.amb-widget-separatelabel>.label {
+  /* border-left: 4px solid #5893ef; */
+  border-bottom: 2px solid #5893ef;
+  color: #5893ef;
+  display: inline-block;
+  padding-left: 6px;
+  padding-right: 6px;
+  padding-bottom: 10px;
+  /* font-size: 14px; */
+  margin-bottom: -8px;
 }

package/src/utils/calculator/calculator-factory.js

@@ -11,12 +11,7 @@ class CalculatorFactory {
    * @return
    */
   isNullValue(leftValue, operator) {
-    return (
-      (leftValue === undefined ||
-        leftValue === null ||
-        leftValue + '' === '') &&
-      operator === 'IS_NULL'
-    )
+    return (leftValue === undefined || leftValue === null || leftValue + '' === '') && operator === 'IS_NULL'
   }
   /**
    * 空IS NOT NULL操作符时的处理
@@ -25,12 +20,7 @@ class CalculatorFactory {
    * @return true 表示给定的值不为空
    */
   isNotNullValue(leftValue, operator) {
-    return (
-      leftValue !== undefined &&
-      leftValue !== null &&
-      leftValue + '' !== '' &&
-      operator === 'IS_NOT_NULL'
-    )
+    return leftValue !== undefined && leftValue !== null && leftValue + '' !== '' && operator === 'IS_NOT_NULL'
   }
   /**
    * 空值时相等的处理
@@ -42,9 +32,7 @@ class CalculatorFactory {
   isEQEmptyValue(leftVale, operator, rightValue) {
     return (
       (leftVale === undefined || leftVale === null || leftVale + '' === '') &&
-      (rightValue === undefined ||
-        rightValue === null ||
-        rightValue + '' === '') &&
+      (rightValue === undefined || rightValue === null || rightValue + '' === '') &&
       (operator === 'EQ' || operator === 'CONTAIN')
     )
   }
@@ -81,9 +69,7 @@ class NumberCalculator extends CalculatorFactory {
       } else if (operator === 'IS_NOT_NULL') {
         this.result = leftVale !== undefined && leftVale !== null
       } else {
-        throw new Error(
-          '表达式不合法:' + leftVale + ' ' + operator + ' ' + rightValue
-        )
+        throw new Error('表达式不合法:' + leftVale + ' ' + operator + ' ' + rightValue)
       }
     }
   }
@@ -98,26 +84,28 @@ class TextCalculator extends CalculatorFactory {
     } else if (this.isNotNullValue(leftVale, operator)) {
       this.result = true
     } else if (leftVale === undefined || leftVale === null) {
-      this.result = false
+      if (operator === 'NET') {
+        this.result = leftVale + '' !== rightValue + ''
+      } else if (operator === 'EQ') {
+        this.result = leftVale + '' === rightValue + ''
+      } else {
+        this.result = false
+      }
     } else {
       if (operator === 'NET') {
-        this.result = (leftVale+'') !== (rightValue+'')
+        this.result = leftVale + '' !== rightValue + ''
       } else if (operator === 'EQ') {
-        this.result = (leftVale+'') === (rightValue+'')
+        this.result = leftVale + '' === rightValue + ''
       } else if (operator === 'NOT_CONTAIN') {
-        this.result = !(leftVale+'').includes(rightValue+'')
+        this.result = !(leftVale + '').includes(rightValue + '')
       } else if (operator === 'CONTAIN') {
-        this.result = (leftVale+'').includes(rightValue+'')
+        this.result = (leftVale + '').includes(rightValue + '')
       } else if (operator === 'IS_NULL') {
-        this.result =
-          leftVale === undefined || leftVale === null || leftVale === ''
+        this.result = leftVale === undefined || leftVale === null || leftVale === ''
       } else if (operator === 'IS_NOT_NULL') {
-        this.result =
-          leftVale !== undefined && leftVale !== null && leftVale !== ''
+        this.result = leftVale !== undefined && leftVale !== null && leftVale !== ''
       } else {
-        throw new Error(
-          '表达式不合法:' + leftVale + ' ' + operator + ' ' + rightValue
-        )
+        throw new Error('表达式不合法:' + leftVale + ' ' + operator + ' ' + rightValue)
       }
     }
   }

package/src/utils/common-util.js

@@ -1,6 +1,6 @@
 import * as Vue from 'vue'
 import authApi from './auth-api'
-import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
+import { getToken, getLanguage, getAllLanguages, setAllLanguages, removeToken } from './auth'
 import { v4 as uuidv4 } from 'uuid'
 import { getCookieCache } from './auth'
 import i18nUtil from './i18n-util'
@@ -672,3 +672,25 @@ export function getCurrentSystemCode() {
     return window.$vueApp.config.globalProperties.systemCode
   }
 }
+
+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
+    ) {
+      // removeToken()
+      // this.$router.replace({
+      //   path: '/login'
+      // })
+      isTimeout = true
+    }
+  }
+  return isTimeout
+}

package/vite.config.js

@@ -1,21 +1,17 @@
 import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
 import path from "path";
-import { terser } from 'rollup-plugin-terser'
+// import { terser } from 'rollup-plugin-terser'
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [
-    vue(),  
-    terser({
-      compress: {
-        drop_console: true,
-        drop_debugger: true
-      },
-      output: {
-        // 对于console.error，不做任何处理
-        comments: (node, comment) => comment.type === 'error'
-      }
-    })
+    vue()
+    // terser({
+    //   output: {
+    //     // 对于console.error，不做任何处理
+    //     comments: (node, comment) => comment.type === 'error'
+    //   }
+    // })
   ],
   build: {
     outDir: "lib", //输出文件名称