agilebuilder-ui 1.0.49 → 1.0.51

package/package.json

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

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

@@ -194,13 +194,19 @@ export default {
     isSql: {
       type: Boolean,
       default: false
-    }
+    },
+				openFsUpload:{
+						type: Boolean,
+						default: true
+				}
   },
   created() {},
   mounted() {},
   methods: {
     openAnnexUpload() {
-      this.annexUploadFlag = true
+						if (this.openFsUpload){
+								this.annexUploadFlag = true
+						}
     },
     handleBeforeUpload(file) {
       let limitFileSize = this.fileSetObj.limitFileSize

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

@@ -7,6 +7,7 @@
     :show-file-list="false"
     auto-upload
     :headers="headers"
+				:disabled="!openFsUpload"
     :action="defaultAction"
     :multiple="multiple"
     :before-upload="handleBeforeUpload"
@@ -30,6 +31,10 @@ import { getToken } from '../../../src/utils/auth'
 import type { UploadFile, UploadFiles } from 'element-plus'
 import fsPreviewNew from './fs-preview-new.vue'
 const props = defineProps({
+		openFsUpload:{
+				type: Boolean,
+				default: true
+		},
   systemCode: {
     type: String,
     default: ''

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

@@ -10,6 +10,7 @@
     :headers="headers"
     :action="defaultAction"
     :multiple="multiple"
+				:disabled="!openFsUpload"
     :before-upload="handleBeforeUpload"
     :before-remove="beforeRemove"
     :on-success="onSuccess"
@@ -33,6 +34,10 @@ import { getToken } from '../../../src/utils/auth'
 import type { UploadFile, UploadFiles } from 'element-plus'
 import fsPreviewNew from './fs-preview-new.vue'
 const props = defineProps({
+		openFsUpload:{
+				type: Boolean,
+				default: true
+		},
   systemCode: {
     type: String,
     default: ''

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

@@ -5,6 +5,7 @@
     :row="entity"
     :disabled="disabled"
     :fileInfo="fileInfo"
+				:openFsUpload="openFsUpload"
     :fileSetObj="{ accept: accept, multiple: multiple, limitFileSize: limitFileSize }"
     @upload-success="onInputUploadSuccess"
     @delete-success="onInputDeleteSuccess"
@@ -29,6 +30,7 @@
     :beforeDownload="beforeDownload"
     :pageContext="pageContext"
     :configure="configure"
+				:openFsUpload="openFsUpload"
   />
   <fs-drag-upload
     v-else-if="displayType === 'drag'"
@@ -50,6 +52,7 @@
     :beforeDownload="beforeDownload"
     :pageContext="pageContext"
     :configure="configure"
+				:openFsUpload="openFsUpload"
   />
 </template>
 <script setup lang="ts">
@@ -57,6 +60,10 @@ import FsDragUpload from './fs-drag-upload.vue'
 import FsButtonUpload from './fs-button-upload.vue'
 import { ref, defineProps } from 'vue'
 const props = defineProps({
+		openFsUpload:{
+				type: Object,
+				default: true
+		},
   entity: {
     type: Object,
     default: () => {

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

@@ -174,6 +174,11 @@ export default {
 			type: String,
 			default: ',',
 		},
+			// 是否打开树
+		openTree:{
+				type: Boolean,
+				default: true,
+		}
 	},
 	data() {
 		return {
@@ -194,17 +199,19 @@ export default {
 		},
 		// 打开组织树
 		showOrganizationTree() {
-			let isMulti = this.multiple
-			if (typeof isMulti === 'undefined') {
-				isMulti = false
-			}
-			if (isMulti === true) {
-				// 多选时才需要显示结果集合
-				this.getSelectInfo()
-			}
-			this.$emit('focus')
-			this.showOrganizationTreeFlag = true
-			this.$emit('show-tree')
+				if (this.openTree){
+						let isMulti = this.multiple
+						if (typeof isMulti === 'undefined') {
+								isMulti = false
+						}
+						if (isMulti === true) {
+								// 多选时才需要显示结果集合
+								this.getSelectInfo()
+						}
+						this.$emit('focus')
+						this.showOrganizationTreeFlag = true
+						this.$emit('show-tree')
+				}
 		},
 		getPropName(prop, isJoinTable, tableName) {
 			return getPropNameWhenJoinTable(prop, isJoinTable, tableName)

package/packages/rich-editor/index.vue

@@ -131,7 +131,7 @@ export default {
 		toolbar: {
 			type: [String, Array],
 			default:
-					' undo redo | formatselect fontsizeselect bold italic strikethrough underline hr forecolor backcolor | image |  ' +
+					' undo redo | formatselect fontsizeselect bold italic strikethrough underline hr forecolor backcolor| link | image |  ' +
 					'  lineheight   bullist numlist table | print fullscreen  preview  ',
 		},
 	},

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

@@ -131,7 +131,7 @@ const apis = {
     }
   },
   // 新建行
-  createRow(listCode, row) {
+  createRow(listCode, row, options) {
     return new Promise((resolve, reject) => {
       if (!listCode) {
         listCode = store.get('_list_code')
@@ -245,7 +245,9 @@ const apis = {
             gridParams.defaultValueColumns,
             gridParams.additionalParamMap,
             gridParams.contextParameter,
-            row
+            row,
+            listCode,
+            options?options.getDefaultValueFunc: null
           )
 
           // console.log('创建行记录要添加的新行1', row)
@@ -356,7 +358,8 @@ const apis = {
     additionalParamMap,
     contextParameter,
     row,
-    listCode
+    listCode,
+    getDefaultValueFunc
   ) {
     if (!row) {
       row = {}
@@ -366,7 +369,7 @@ const apis = {
     }
     const gridParams = store.get(listCode)
     if (gridParams && gridParams.allColumns) {
-      this.setColumnsDefaultValue(gridParams.allColumns, row)
+      this.setColumnsDefaultValue(gridParams.allColumns, row, gridParams, getDefaultValueFunc)
     }
     if (defaultValueColumns && defaultValueColumns.length > 0) {
       for (var i = 0; i < defaultValueColumns.length; i++) {
@@ -401,7 +404,7 @@ const apis = {
     return row
   },
   // 设置默认值null
-  setColumnsDefaultValue(allColumns, row) {
+  setColumnsDefaultValue(allColumns, row, gridParams, getDefaultValueFunc) {
     for (let i = 0; i < allColumns.length; i++) {
       const column = allColumns[i]
       const prop = column.prop
@@ -414,7 +417,18 @@ const apis = {
       } else {
         if (row[prop] === undefined) {
           // 不是操作列，才需要设值
-          setEntityFieldValue(row, prop, null)
+          const defaultValueSet = column.defaultValue
+          let defaultValue = null
+          console.log('setColumnsDefaultValue111------')
+          if(!getDefaultValueFunc) {
+            console.log('setColumnsDefaultValue22---getDefaultValueFunc222---')
+            defaultValue = getDefaultValueFunc(gridParams.pageContext, defaultValueSet, null, null)
+            console.log('setColumnsDefaultValue33---defaultValue---', defaultValue)
+            if(defaultValue === undefined) {
+              defaultValue = null
+            }
+          }
+          setEntityFieldValue(row, prop, defaultValue)
         }
       }
     }
@@ -1346,5 +1360,21 @@ const apis = {
       }
     }
   },
+  refreshChildData(listCode, gridData, isShowPageArea) {
+    const gridParams = store.get(listCode)
+    if (isShowPageArea === undefined ||
+      isShowPageArea === null ||
+      isShowPageArea === false) {
+      // 子表不分页
+      // console.log('refreshChildData111====', listCode + 'listCode', gridData)
+      gridParams.gridData = gridData
+      this.gridData = gridData
+    } else {
+      // 子表分页
+      // console.log('refreshChildData222====', listCode + 'listCode', gridData)
+      gridParams.subTableData = gridData
+      this.subTableData = gridData
+    }
+  }
 }
 export default apis

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

@@ -270,19 +270,21 @@
 		            :title="getMyHyperLinkSetting(scope.row).title"
 		            class="ellipsis cell--span"
             >{{ getMyHyperLinkSetting(scope.row).label
-	            }}<i
-			            v-if="getMyHyperLinkSetting(scope.row).icon"
-			            :class="getMyHyperLinkSetting(scope.row).icon"
-	            /></span>
+	            }}
+              <el-icon v-if="getMyHyperLinkSetting(scope.row).icon">
+                <component :is="getMyHyperLinkSetting(scope.row).icon"/>
+              </el-icon>
+            </span>
             <span
 		            v-else
 		            :id="column.prop + 'DomData' + scope.$index"
 		            class="cell--span"
             >{{ getMyHyperLinkSetting(scope.row).label
-	            }}<i
-			            v-if="getMyHyperLinkSetting(scope.row).icon"
-			            :class="getMyHyperLinkSetting(scope.row).icon"
-	            /></span>
+	            }}
+              <el-icon v-if="getMyHyperLinkSetting(scope.row).icon">
+                <component :is="getMyHyperLinkSetting(scope.row).icon"/>
+              </el-icon>
+            </span>
           </el-link>
           <span
 		          v-else-if="isShowOverflowTooltip"
@@ -378,19 +380,21 @@
 		            :title="$escapeHtml(getMyHyperLinkSetting(scope.row).title)"
 		            class="ellipsis cell--span"
             >{{ $escapeHtml(getMyHyperLinkSetting(scope.row).label)
-	            }}<i
-			            v-if="getMyHyperLinkSetting(scope.row).icon"
-			            :class="getMyHyperLinkSetting(scope.row).icon"
-	            /></span>
+	            }}
+              <el-icon v-if="getMyHyperLinkSetting(scope.row).icon">
+                <component :is="getMyHyperLinkSetting(scope.row).icon"/>
+              </el-icon>
+            </span>
             <span
 		            v-else
 		            :id="column.prop + 'DomData' + scope.$index"
 		            class="cell--span"
             >{{ $escapeHtml(getMyHyperLinkSetting(scope.row).label)
-	            }}<i
-			            v-if="getMyHyperLinkSetting(scope.row).icon"
-			            :class="getMyHyperLinkSetting(scope.row).icon"
-	            /></span>
+	            }}
+              <el-icon v-if="getMyHyperLinkSetting(scope.row).icon">
+                <component :is="getMyHyperLinkSetting(scope.row).icon"/>
+              </el-icon>
+            </span>
           </el-link>
 	        <!-- 富文本 -->
           <span
@@ -474,7 +478,7 @@ import ViewImageDialog from './view-image-dialog.vue'
 import eventBus from './eventBus'
 import FsPreview from '../../fs-preview'
 import RichEditorViewer from '../../rich-editor/viewer.vue'
-import GridIcon from './components/grid-icon'
+import GridIcon from './components/grid-icon.vue'
 export default {
 	components: {
 		DynamicInput,

package/packages/super-grid/src/search-form-number.vue

@@ -48,6 +48,7 @@
 
 <script>
 import { $on, $off, $once, $emit } from '../../utils/gogocodeTransfer'
+import eventBus from './eventBus'
 export default {
   props: {
     r: {
@@ -87,6 +88,16 @@ export default {
       number2,
     }
   },
+  mounted() {
+    // 查询条件重置时，数值区间组件的值需要清空
+    eventBus.$on('reset', () => {
+      this.number1 = null
+      this.number2 = null
+    })
+  },
+  destroyed() {
+    eventBus.$off('reset')
+  },
   watch: {
     itemValue: {
       deep: true,

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

@@ -99,7 +99,7 @@ import {$on, $off, $once, $emit} from '../../utils/gogocodeTransfer'
 import searchMethods from './search-methods'
 // import searchFormNumber from './search-form-number.vue'
 import searchFormOrdinarySearch from './search-form-ordinarySearch.vue'
-import searchFormAdvancedQuery from './search-form-advancedQuery'
+import searchFormAdvancedQuery from './search-form-advancedQuery.vue'
 import store from './store'
 // import { isOptionFunction, getSearchObject } from './utils'
 import {addDynamicProp, addDynamicPropDateSection} from './utils'
@@ -514,6 +514,8 @@ export default {
 				this.$refs.searchFormAdvancedQuery.resetForm()
 				$emit(this, 'reset')
 			}
+			// 数值区间组件重置时无法清空值问题
+			eventBus.$emit('reset')
 			// 子组件重置完成后调用reset方法 同步执行
 			// this.$emit('reset')
 		},

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

@@ -74,7 +74,7 @@
       >
         <template v-if="myCustomFormatter">
           <component
-            :is="getComponentType(column.prop)"
+            :is="getComponentType(column)"
             v-for="(column, index) in visibleColumns"
             :ref="column.prop"
             :key="column.label + index"
@@ -82,7 +82,7 @@
             :is-sql="isSql"
             :list-code="code"
             :custom-format="
-              getComponentType(column.prop) === 'GroupColumn'
+              getComponentType(column) === 'GroupColumn'
                 ? myCustomFormatter
                 : myCustomFormatter[column.prop]
             "
@@ -108,7 +108,7 @@
         </template>
         <template v-else>
           <component
-            :is="getComponentType(column.prop)"
+            :is="getComponentType(column)"
             v-for="(column, index) in visibleColumns"
             :ref="column.prop"
             :key="column.label + index"
@@ -2288,7 +2288,8 @@ export default {
       }
       return searchParam
     },
-    getComponentType(prop) {
+		getComponentType (column) {
+      const prop = column
       let type = 'NormalColumn'
       if (prop === '$index') {
         type = 'IndexColumn'
@@ -2296,7 +2297,7 @@ export default {
         // 设置选中行时使用
         store.get(this.code).isMulitiSelect = true
         type = 'SelectionColumn'
-      } else if (prop === undefined) {
+      } else if (prop === undefined && column.children && column.children.length > 0) {
         type = 'GroupColumn'
       }
 			// console.log('%c描述-180428','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',this.myCustomFormatter);

package/src/api/sso-service.js

@@ -184,11 +184,17 @@ function getUserPermissionMenusBySystemCode(systemCode) {
  * @returns 
  */
 function getDevPlatformPermissions(roleCodes) {
+  let systemCode
+  if (window.$vueApp.config.globalProperties.customSystem) {
+    systemCode = window.$vueApp.config.globalProperties.customSystem
+  } else {
+    systemCode = window.$vueApp.config.globalProperties.systemCode
+  }
   return request.get(
     window.$vueApp.config.globalProperties.baseAPI +
       '/component/devp-permissions?roleCodes=' +roleCodes +
       '&_t=' +
-      new Date().getTime()
+      new Date().getTime() + '&systemCode=' + systemCode
   )
 }
 

package/src/i18n/langs/cn.js

@@ -76,10 +76,12 @@ const cn = {
         fileUpload: '文件上传',
         selectYear: '选择年',
         search: '查询',
-        forbiddenException: '您没有权限访问该资源',
+        forbiddenException: '您没有权限访问',
         theButtonIsNotBoundToAResource: '该按钮未绑定资源,请先绑定资源',
         asyncExport: '正在异步导出，请等待消息通知!',
         selectedWorkingGroup: '已选工作组',
+        forbiddenExceptionLinkUrl: '请点击进行权限申请',
+        forbiddenExceptionLinkUser: '如有疑问请联系'
     },
     // 列表组件
     superGrid: {

package/src/i18n/langs/en.js

@@ -77,11 +77,13 @@ const en = {
         fileUpload: 'File Upload',
         selectYear: 'Select Year',
         search: 'Search',
-        forbiddenException: 'You do not have permission to access this resource',
+        forbiddenException: 'You do not have permission to access',
         theButtonIsNotBoundToAResource:
             'The button is not bound to a resource, Bind the resource first',
         asyncExport: 'Asynchronous export, please wait for message notification!',
         selectedWorkingGroup: 'Selected working group',
+        forbiddenExceptionLinkUrl: 'please click to apply',
+        forbiddenExceptionLinkUser: 'if you have any questions,please contact'
     },
     superGrid: {
         columnConfig: 'Column Config',

package/src/styles/theme/ocean-blue/button.scss

@@ -19,26 +19,21 @@
     border-color: $--button-primary-btn-color;
   }
 
-  .operation-area .el-button--primary {
-    border-radius: 4px;
-    background: $--button-primary-btn-color;
-    border-color: $--button-primary-btn-color;
-  }
-
-  .operation-area .el-button--primary:hover{
-    color: $--button-primary-btn-color;
-    background: $--button-primary-btn-color;
-  }
-
   .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;
+  }
+
   .menuDownBtn .el-button-group .el-button {
-    border-color: #005eba;
-    color: #005eba;
+    border-color: $--button-default-border-color;
+    color: $--button-default-font-color;
   }
 
   .is-plain {
@@ -80,4 +75,30 @@
   .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;
+  }
+
+  //警告按钮
+  .el-button--danger{
+    background-color: #FFFFFF;
+    color: #8C8C8C;
+    border: 1px solid #E3E3E3;
+  }
+  //工作流结束按钮
+  .workflow-end-button{
+    background-color: #ee6666;
+    border-color: #ee6666;
+    color: #FFFFFF;
+  }
+  //撤回按钮
+  .button--return {
+    background-color: #FFFFFF;
+    color: #8C8C8C;
+    border: 1px solid #E3E3E3;
+  }
+
 }

package/src/styles/theme/ocean-blue/card.scss

@@ -1,3 +1,4 @@
+@import "./ocean-blue.scss";
 .ocean-blue {
   $titleColor: rgba(0, 0, 0, 0.85);
 
@@ -43,11 +44,12 @@
   .platform-card {
     .el-card__header {
       height: 40px;
-      background: #F0F8FE;
-      color: #005EBA;
+      background: $--card-header-color;
+      color: #333333;
       font-family: Source Han Sans CN;
       font-weight: medium;
       font-size: 14px;
+      font-weight: bold;
       text-align: left;
       padding: 9px 0px 9px 20px;
     }
@@ -55,6 +57,10 @@
     .el-card__header>div {
       line-height: 22px;
     }
+    .el-card__header>div>span {
+      border-left: 3px solid $--color-primary;
+      padding-left: 5px;
+    }
   }
   .card-style {
     width: 100%;

package/src/styles/theme/ocean-blue/checkbox.scss

@@ -7,4 +7,7 @@
     background-color: $--color-primary;
     border-color: $--color-primary;
   }
+  .el-checkbox-group .is-checked .el-checkbox__label{
+    color: $--color-primary;
+  }
 }

package/src/styles/theme/ocean-blue/index.scss

@@ -5,6 +5,7 @@
 @import './card.scss';
 @import './tab.scss';
 @import './input.scss';
+@import './select.scss';
 @import './form.scss';
 @import './pagination.scss';
 @import './button.scss';

package/src/styles/theme/ocean-blue/ocean-blue.scss

@@ -1,6 +1,7 @@
 /* 改变主题色变量 */
 $--color-primary: #0089BA;
 $--color-hover: #ebf6f9;
+$--color-card: #E5EFFF;
 $--button-default-border-color: $--color-primary;
 $--button-default-font-color: $--color-primary;
 $--button-font-weight: regular;
@@ -10,6 +11,8 @@ $--button-primary-btn-color: #05a0da;
 $--menu-dont-color: $--color-primary;
 //选中的字体颜色
 $--select-font-color: $--color-primary;
+//卡片头部颜色
+$--card-header-color: $--color-card;
 
 $--menu-hove-background-color: $--color-hover;
 $--button-opt-background-color: #0780ED;

package/src/styles/theme/ocean-blue/select.scss

@@ -0,0 +1,6 @@
+@import "./ocean-blue.scss";
+.ocean-blue {
+  .el-select-dropdown__list .is-selected{
+    color: $--select-font-color;
+  }
+}