agilebuilder-ui 1.1.4-temp2 → 1.1.4-temp4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.4-temp2",
+  "version": "1.1.4-temp4",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/fs-preview/src/fs-preview.vue

@@ -167,7 +167,7 @@ export default {
         const uuids = serverPath.split(',')
         const baseURL = window.$vueApp.config.globalProperties.baseURL
         const baseAPI = window.$vueApp.config.globalProperties.baseAPI
-        const tempAction = baseURL + '/common/fs-upload/search-file-names'
+        let tempAction = baseURL + '/common/fs-upload/search-file-names'
         if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
           tempAction = baseAPI + '/api/search-file-names'
         }

package/packages/fs-upload-list/src/fs-upload-list.vue

@@ -308,8 +308,8 @@ export default {
       const uuids = this.fileInfo.serverPath.split(',')
       const baseURL = window.$vueApp.config.globalProperties.baseURL
       const baseAPI = window.$vueApp.config.globalProperties.baseAPI
-      const tempAction = baseURL + '/common/fs-upload/search-file-names'
-      if (isPlateSys(this.systemCode)) {
+      let tempAction = baseURL + '/common/fs-upload/search-file-names'
+      if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
         tempAction = baseAPI + '/api/search-file-names'
       }
       this.$http.post(tempAction, uuids).then((result) => {

package/packages/fs-upload-new/src/fs-button-upload.vue

@@ -16,9 +16,7 @@
   >
     <el-button size="small" type="primary">{{ placeholder }}</el-button>
     <template #tip>
-      <el-text size="small">
-        {{ accept }} {{ $t('imatrixUIMessage.uploadFileTip', { fileSzie: limitFileSize }) }}</el-text
-      >
+      <el-text size="small"> {{ accept }} {{$t('imatrixUIMessage.uploadFileTip',{fileSize: limitFileSize})}}</el-text>
     </template>
   </el-upload>
   <template v-if="fileList && fileList.length > 0">
@@ -127,7 +125,7 @@ if (props.action) {
   defaultAction.value = props.action
 } else {
   let tempAction = baseURL + '/common/fs-upload'
-  if (isPlateSys(props.systemCode)) {
+  if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
     tempAction = baseAPI + '/component/super-form/uploads'
   }
   defaultAction.value = tempAction

package/packages/fs-upload-new/src/fs-drag-upload.vue

@@ -18,9 +18,7 @@
     <el-icon class="el-icon--upload"><upload-filled /></el-icon>
     <div class="el-upload__text">{{ placeholder }}</div>
     <template #tip>
-      <el-text size="small">
-        {{ accept }} {{ $t('imatrixUIMessage.uploadFileTip', { fileSzie: limitFileSize }) }}</el-text
-      >
+      <el-text size="small"> {{ accept }} {{$t('imatrixUIMessage.uploadFileTip',{fileSize: limitFileSize})}}</el-text>
     </template>
   </el-upload>
   <template v-if="fileList && fileList.length > 0">
@@ -129,7 +127,7 @@ if (props.action) {
   defaultAction.value = props.action
 } else {
   let tempAction = baseURL + '/common/fs-upload'
-  if (isPlateSys(props.systemCode)) {
+  if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
     tempAction = baseAPI + '/component/super-form/uploads'
   }
   defaultAction.value = tempAction

package/packages/fs-upload-new/src/fs-upload-new.vue

@@ -124,7 +124,7 @@ import FileUploadMobile from './file-upload-mobile/file-upload.vue'
 import FileUploadInputMobile from './file-upload-mobile/file-upload-input.vue'
 import { ref, defineProps } from 'vue'
 import { getReplaceUrlDomain, isMobileBrowser, isPlateSys } from '../../../src/utils/common-util'
-import { Download } from '@element-plus/icons-vue/dist/types'
+import { Download } from '@element-plus/icons-vue'
 const props = defineProps({
   openFsUpload: {
     type: Object,

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

@@ -658,7 +658,14 @@ export default {
     const colConfigure = gridParams.colConfigureMap ? gridParams.colConfigureMap[this.column.prop] : null
     const runtimeInfo = colConfigure && colConfigure.runtime ? colConfigure.runtime : {}
     const designProperty = runtimeInfo.props ? runtimeInfo.props : {}
-    console.log('super-grid-dynamicInput--designProperty=', designProperty, 'colConfigure=', colConfigure, 'gridParams.colConfigureMap=', gridParams.colConfigureMap)
+    console.log(
+      'super-grid-dynamicInput--designProperty=',
+      designProperty,
+      'colConfigure=',
+      colConfigure,
+      'gridParams.colConfigureMap=',
+      gridParams.colConfigureMap
+    )
     return {
       deptManTree: false, // 是否是部门人员树
       isMultiTree: false, // 是否是多选树
@@ -1825,6 +1832,8 @@ export default {
         return 'YYYY'
       } else if (this.type === 'month') {
         return 'MM'
+      } else if (this.dataType === 'TIME') {
+        return 'HH:mm:ss'
       }
       return 'YYYY-MM-DD'
     },
@@ -1938,7 +1947,12 @@ export default {
       let configureObj = this.colConfigure
       let linkPage = configureObj.props.linkPage
       console.log('doClickwithJumpPage-----linkPage=', linkPage, 'eventName=', eventName)
-      if (eventName && (eventName === 'click' || eventName === 'prefixClick'  || eventName === 'suffixClick' ) && (linkPage && linkPage.jumpPageUrl)) {
+      if (
+        eventName &&
+        (eventName === 'click' || eventName === 'prefixClick' || eventName === 'suffixClick') &&
+        linkPage &&
+        linkPage.jumpPageUrl
+      ) {
         // 表示有跳转页面配置
         const jumpJson = JSON.parse(JSON.stringify(linkPage))
         if (jumpJson && Array.isArray(jumpJson)) {
@@ -1960,7 +1974,7 @@ export default {
         this.jumpPageLink(this.column, this.row, this.listCode, this.rowIndex, jumpJson)
       } else {
         // 表示没有跳转页面配置
-        this.callCustomEvent(eventName) 
+        this.callCustomEvent(eventName)
       }
     }
   }

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

@@ -404,7 +404,7 @@ export default {
     if (this.options && this.options.configureObj) {
       configureObj = this.options.configureObj
     }
-   
+
     let pageContext
     if (this.options && this.options.pageContext) {
       pageContext = this.options.pageContext
@@ -2168,10 +2168,10 @@ export default {
         // 表示更改了排序信息
         searchParam.sorts = this.sortInfo
       }
+      if (!searchParam.sorts) {
+        searchParam.sorts = []
+      }
       if (this.mergeFields && this.mergeFields.length > 0) {
-        if (!searchParam.sorts) {
-          searchParam.sorts = []
-        }
         const mergeFieldsArr = []
         for (const mergeField of this.mergeFields) {
           let flag = true
@@ -2191,6 +2191,10 @@ export default {
         mergeFieldsArr.push(...searchParam.sorts)
         searchParam.sorts = mergeFieldsArr
       }
+      debugger
+      if (gridParams.options.initSortInfo) {
+        searchParam.sorts.push(gridParams.options.initSortInfo)
+      }
       // 是否有初始过滤条件
       if (gridParams.options && typeof gridParams.options.initSearchForm !== 'undefined') {
         searchParam.initSearchForm = gridParams.options.initSearchForm
@@ -3129,14 +3133,14 @@ export default {
     },
     // 封装v10字段配置，key是数据库字段名（属性名），value是该字段的配置
     packageListColumnSetting() {
-       // key是属性名，value是字段配置
+      // key是属性名，value是字段配置
       let colConfigureMap = {}
-      if(this.configureObj){
+      if (this.configureObj) {
         const colItems = this.configureObj.items
-        if(colItems) {
-          colItems.forEach((colConfigure)=>{
+        if (colItems) {
+          colItems.forEach((colConfigure) => {
             const propName = this.getFormPropName(colConfigure.props.base.prop)
-            if(propName){
+            if (propName) {
               colConfigureMap[propName] = colConfigure
             }
           })

package/packages/workgroup-tree-mobile/src/dept-result.vue

@@ -44,8 +44,9 @@ function removeDept (item) {
 
 function showResult() {
     isShowForm.value = true
+		JSON.stringify()
 }
 
 defineExpose({showResult})
 
-</script>
+</script>

package/src/styles/index.scss

@@ -17,6 +17,8 @@
 @import './theme/green/sidebar.scss';
 @import './display-layout.scss';
 @import "./table.scss";
+@import './theme/tiffany-blue-mobile/index.scss';
+@import './theme/tiffany-blue-mobile/sidebar.scss';
 
 body {
   overflow: hidden;

package/src/styles/mixin.scss

@@ -1,9 +1,10 @@
 @mixin clearfix {
-  :after {
-    content: "";
-    display: table;
-    clear: both;
-  }
+  // 影响flex布局注释掉
+  // :after {
+  //   content: "";
+  //   display: table;
+  //   clear: both;
+  // }
 }
 
 @mixin scrollBar {

package/src/styles/theme/tiffany-blue-mobile/button.scss

@@ -0,0 +1,122 @@
+@import "./var.scss";
+
+.tiffany-blue-mobile {
+  .is-text {
+    color: $--button-default-font-color !important;
+  }
+
+  .is-link {
+    color: $--button-default-font-color !important;
+
+    :hover {
+      color: #a0d5ff;
+    }
+  }
+
+  .el-button--primary {
+    border-radius: 4px;
+    background: $--button-primary-btn-color;
+    border-color: $--button-primary-btn-color;
+  }
+
+  .el-button.el-button--primary:hover {
+    background-color: $--color-button-hover;
+  }
+
+  .button--default {
+    border-radius: 4px;
+    border-color: $--color-primary;
+    color: $--color-primary;
+  }
+
+  .button--default:hover {
+    color: $--color-primary;
+    background-color: $--color-hover;
+    border-color: $--color-primary;
+  }
+
+  .operation-area .el-button-group .el-button {
+    border-color: $--button-default-border-color;
+    color: $--button-default-font-color;
+  }
+
+  .operation-area .el-button-group .el-button:hover {
+    background-color: $--color-hover;
+  }
+
+  .el-button.el-button--primary.is-plain {
+    color: $--button-default-font-color;
+    background-color: #ffffff;
+    border: 1px solid $--button-default-border-color;
+  }
+
+  .el-button.el-button--primary.is-plain:hover {
+    color: $--color-primary;
+    background-color: $--color-hover;
+    border-color: $--color-primary;
+  }
+
+  .el-dropdown-link {
+    color: $--button-default-font-color;
+    font-family: Source Han Sans CN;
+    font-weight: regular;
+    font-size: 0.9rem;
+    line-height: 22px;
+    letter-spacing: 0px;
+    text-align: center;
+    cursor: pointer;
+  }
+
+  //switch 开关选中字体样式
+  .el-switch__label.is-active {
+    color: $--color-primary;
+  }
+
+  //switch 开关样式
+  .el-switch.is-checked .el-switch__core {
+    border-color: $--color-primary;
+    background-color: $--color-primary;
+  }
+
+  //单选选中样式
+  .el-radio__input.is-checked .el-radio__inner {
+    color: $--color-primary;
+    border-color: $--color-primary;
+    background-color: $--color-primary;
+  }
+
+  //单选选中样式
+  .el-radio__input.is-checked+.el-radio__label {
+    color: $--color-primary;
+  }
+
+  //下拉菜单
+  .el-dropdown__list .el-dropdown-menu .el-dropdown-menu__item:hover {
+    color: $--select-font-color;
+    background-color: $th-cell-background;
+  }
+
+  //工作流结束按钮
+  .workflow-end-button {
+    background-color: #ee6666;
+    border-color: #ee6666;
+    color: #FFFFFF;
+  }
+
+  //返回按钮
+  .button--return {
+    background-color: #FFFFFF;
+    color: #8C8C8C;
+    border: 1px solid #E3E3E3;
+  }
+
+  //page-runtime 头部按钮样式
+  .page-runtime-header-btn {
+    margin-bottom: 10px;
+    display: inline-block;
+  }
+
+  .page-runtime-header-btn+.page-runtime-header-btn {
+    margin-left: 5px;
+  }
+}

package/src/styles/theme/tiffany-blue-mobile/card.scss

@@ -0,0 +1,144 @@
+@import "./var.scss";
+
+.tiffany-blue-mobile {
+  $titleColor: rgba(0, 0, 0, 0.85);
+
+  el-card box-card is-always-shadow .card-radius {
+    border-radius: 12px
+  }
+
+  .form-card-header {
+    width: 3px;
+    height: 14px;
+    left: 0;
+    align-items: center;
+    text-align: center;
+  }
+
+  .form-card-header-bgc {
+    width: 3px;
+    height: 14px;
+    display: flex;
+    background-color: #3D4CF2
+  }
+
+  .form-card-text {
+    padding-left: 8px;
+    font-size: 1rem;
+    line-height: 24px;
+    font-weight: 500;
+    color: $titleColor;
+    display: table-cell;
+    position: relative;
+  }
+
+  .superForm {
+    .el-card {
+      border-radius: 12px;
+      box-shadow: 0 1px 4px 0 rgba(0, 13, 31, 0.10);
+    }
+
+
+  }
+
+
+  .el-card__header {
+    height: 40px;
+    background: linear-gradient(180deg, rgba(129, 216, 207, 0.25) 0%, rgba(255, 255, 255, 0) 100%);
+    color: #333333;
+    font-family: Source Han Sans CN;
+    font-size: 0.9rem;
+    font-weight: bold;
+    text-align: left;
+    padding: 9px 0px 9px 20px;
+    display: flex;
+    align-items: center;
+  }
+
+  .card-style {
+    width: 100%;
+    margin-top: 20px;
+  }
+
+  .ab_ui_card {
+    height: 86px;
+    width: 100%;
+    background: #FFFFFF;
+    box-shadow: 0px 0px 20px 0px rgba(204, 204, 204, 0.15);
+    margin-top: 10px;
+    position: relative;
+    padding: 10px;
+    box-sizing: border-box;
+    border-radius: 10px;
+
+    .ab_ui_card_header_bg {
+      border-radius: 10px;
+      width: 100%;
+      height: 20px;
+      background: linear-gradient(180deg, rgba(129, 216, 207, 0.25) 0%, rgba(255, 255, 255, 0) 100%);
+      position: absolute;
+      top: 0;
+      left: 0;
+    }
+
+    .ab_ui_card_header_message {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+
+      .ab_ui_card_header_message_left {
+        display: flex;
+
+        .ab_ui_card_title {
+          font-size: 1rem;
+          margin-right: 5px;
+        }
+
+        .ab_ui_card_icon_warning {
+          font-size: 0.6rem;
+          background: linear-gradient(136deg, #FFCF37 0%, #FFA745 100%);
+          border-radius: 4px;
+          padding: 3px 6px;
+          color: #FFFFFF;
+          height: 100%;
+        }
+
+        .ab_ui_card_icon_danger {
+          font-size: 0.6rem;
+          background: linear-gradient(135deg, #FF865D 0%, #FC4A30 100%);
+          border-radius: 4px;
+          padding: 3px 6px;
+          color: #FFFFFF;
+          height: 100%;
+        }
+      }
+
+      .ab_ui_card_time {
+        color: #999999;
+      }
+    }
+
+    .ab_ui_card_content {
+      margin-top: 5px;
+      font-size: 0.8rem;
+      color: #777777;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      width: 80%;
+      height: 100%;
+
+    }
+  }
+
+  .general_card {
+    padding: 20px 10px 10px 10px;
+    box-shadow: 0px 0px 20px 0px rgba(204, 204, 204, 0.15);
+    border-radius: 10px 10px 10px 10px;
+    margin-top: 20px;
+    background-color: #ffffff;
+
+    .title_content {
+      font-size: 0.8rem;
+    }
+  }
+}

package/src/styles/theme/tiffany-blue-mobile/checkbox.scss

@@ -0,0 +1,16 @@
+@import "./var.scss";
+
+.tiffany-blue-mobile {
+
+  .el-checkbox__input.is-checked .el-checkbox__inner,
+  .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+    background-color: $--color-primary;
+    border-color: $--color-primary;
+  }
+  .el-checkbox-group .is-checked .el-checkbox__label{
+    color: $--color-primary;
+  }
+  .el-checkbox__input.is-checked+.el-checkbox__label{
+    color: $--color-primary;
+  }
+}

package/src/styles/theme/tiffany-blue-mobile/dialog.scss

@@ -0,0 +1,17 @@
+.tiffany-blue-mobile {
+  .el-dialog__title::before {
+    content: "";
+    text-align: center;
+    background: #1A6BF3;
+    float: left;
+    position: relative;
+    border-radius: 3px;
+    /** 定义成 block 元素 **/
+    display: block;
+    height: 21px;
+    width: 4px;
+    margin-right: 12px;
+  }
+
+
+}

package/src/styles/theme/tiffany-blue-mobile/element-variables.scss

@@ -0,0 +1,7 @@
+@import "./var.scss";
+// 这样导入报404找不到文件
+// .dark-blue {
+//   /* 改变 icon 字体路径变量，必需 */
+//   $--font-path: '~element-plus/theme-chalk/fonts';
+//   @import '~element-plus/theme-chalk/index.css';
+// }

package/src/styles/theme/tiffany-blue-mobile/font.scss

@@ -0,0 +1,71 @@
+.tiffany-blue-mobile {
+  $titleColor: rgba(0, 0, 0, 0.85);
+
+  .list-file {
+    color: rgba(0, 13, 31, 0.45);
+    font-size: 0.9rem;
+    cursor: pointer;
+  }
+
+  .form-list-file {
+    color: rgba(0, 0, 0, 0.65);
+    background: #F2F6FA;
+    border-radius: 6px;
+    font-size: 0.9rem;
+    cursor: pointer;
+    height: 28px;
+    line-height: 28px;
+    padding: 0 8px 0 8px;
+    margin-right: 32px
+  }
+
+  .tip-font {
+    color: rgba(0, 0, 0, 0.65);
+    font-size: 0.9rem;
+  }
+
+  .superForm {
+    .el-form-item__label {
+      color: rgba(0, 13, 31, 0.85);
+    }
+  }
+
+
+  .page-layout__title {
+    width: 46px;
+    height: 16px;
+    font-size: 0.7rem;
+    font-weight: 500;
+    color: #333333;
+    line-height: 13px;
+  }
+
+  .component-type-name__title {
+    width: 40px;
+    height: 14px;
+    font-size: 0.6rem;
+    font-weight: 500;
+    color: #333333;
+    line-height: 12px;
+    // -webkit-background-clip: text;
+    // -webkit-text-fill-color: transparent;
+  }
+
+  .page-layout__title::before {
+    content: "";
+    text-align: center;
+    background: #1A6BF3;
+    float: left;
+    position: relative;
+    border-radius: 3px;
+    /** 定义成 block 元素 **/
+    display: block;
+    // height: 21px;
+    // width: 4px;
+    margin-right: 12px;
+
+    width: 2px;
+    height: 16px;
+
+  }
+}

package/src/styles/theme/tiffany-blue-mobile/form.scss

@@ -0,0 +1,51 @@
+.tiffany-blue-mobile {
+
+  .button-at-top {
+    width: 100%;
+    background: rgb(255, 255, 255);
+    line-height: 72px;
+    height: 72px;
+    position: absolute;
+    z-index: 100;
+    top: 0px;
+    left: 0px;
+    right: 0px;
+  }
+
+  .button-at-bottom {
+    width: 100%;
+    background: rgb(255, 255, 255);
+    line-height: 72px;
+    height: 72px;
+    position: absolute;
+    bottom: 0px;
+    z-index: 100;
+    left: 0px;
+    right: 0px;
+  }
+
+  .form-top-button {
+    height: 72px;
+    float: left;
+    padding-left: 24px;
+    line-height: 72px;
+  }
+
+  .form-bottom-button {
+    height: 72px;
+    float: right;
+    padding-right: 24px;
+    line-height: 72px;
+  }
+
+  .form-center-position{
+    position: relative;
+
+    .form-center-son{
+      position: absolute;
+      top: 50%;
+      left: 50%;
+      transform: translate(-50%,-50%);
+    }
+  }
+}