agilebuilder-ui 1.0.40 → 1.0.41-beta1

package/package.json

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

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

@@ -15,7 +15,8 @@ import {
   getEntityFieldValue,
   getI18n,
   setEntityFieldValue,
-  getPropValue,
+	getPropValue,
+	getPropValueNew
 } from '../../../src/utils/util'
 import eventBus from './eventBus'
 import { isPromise } from '../../../src/utils/common-util'

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

@@ -313,7 +313,7 @@
       @input="cellEvent('input', $event)"
     />
     <!--mysql数据库--->
-    <el-switch
+    <!-- <el-switch
       v-else-if="(type === 'switch' || column.dataType === 'BOOLEAN') && dataSourceType === 'mysql'"
       ref="item"
       v-model="innerValue"
@@ -322,17 +322,19 @@
       inactive-color="#ff4949"
       @change="cellEvent('change', $event)"
       @input="cellEvent('input', $event, true)"
-    />
+    /> -->
     <!--oracle或sqlserver数据库--->
     <el-switch
       v-else-if="type === 'switch' || column.dataType === 'BOOLEAN'"
       ref="item"
       v-model="innerValue"
-      :active-value="1"
+      :active-text="getSwitchConfig('activeText')"
+      :active-value="getSwitchConfig('activeValue')"
       :disabled="disabled"
-      :inactive-value="0"
-      active-color="#13ce66"
-      inactive-color="#ff4949"
+      :inactive-text="getSwitchConfig('inactiveText')"
+      :inactive-value="getSwitchConfig('inactiveValue')"
+      :active-color="getSwitchConfig('onColor')"
+      :inactive-color="getSwitchConfig('offColor')"
       @change="cellEvent('change', $event)"
       @input="cellEvent('input', $event, true)"
     />
@@ -657,6 +659,11 @@ export default {
       if (valueSetOptionsObj.dynamicDataSourceCode && valueSetOptionsObj.dynamicDataSourceCode !== '') {
         this.dynamicDataSourceCode = valueSetOptionsObj.dynamicDataSourceCode
       }
+    } else if (this.column.componentType === 'switch') {
+      const valueSetOptionsObj = JSON.parse(this.column.valueSetOptions)
+      if (valueSetOptionsObj) {
+        this.valueSetOptions = valueSetOptionsObj
+      }
     }
     if (this.column.orgTreeSet) {
       const orgTreeSet = JSON.parse(this.column.orgTreeSet)
@@ -1425,6 +1432,7 @@ export default {
           return numberValue
         }
       }
+      return val
     },
     refresData(data) {
       $emit(this, 'refresData', data)
@@ -1497,6 +1505,29 @@ export default {
     },
     isInvalidValue(value) {
       return value === undefined || value === null || value === ''
+    },
+    getSwitchConfig(switchProp) {
+      if (this.valueSetOptions && this.valueSetOptions[switchProp]) {
+        return this.valueSetOptions[switchProp]
+      } else {
+        if (switchProp === 'activeValue') {
+          if (this.dataSourceType === 'mysql') {
+            return true
+          } else {
+            return 1
+          }
+        } else if (switchProp === 'inactiveValue') {
+          if (this.dataSourceType === 'mysql') {
+            return false
+          } else {
+            return 0
+          }
+        } else if (switchProp === 'offColor') {
+          return '#ff4949'
+        } else if (switchProp === 'onColor') {
+          return '#13ce66'
+        }
+      }
     }
   }
 }

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

@@ -1,5 +1,5 @@
 <template>
-  <el-table-column width="150" :align="column.groupHeader ? 'center' : ''">
+  <el-table-column :width="column.width ? column.width : 150" :align="column.groupHeader ? 'center' : ''">
     <template v-slot:header>
       <span class="cell--span" :title="label" v-html="label" />
     </template>
@@ -79,6 +79,7 @@ export default {
   },
   created() {
     this.label = this.getHeader()
+				console.log('%c描述-181624','color:#2E3435;background:#F8BB07;padding:3px;border-radius:2px',this.column);
   },
   methods: {
     getHeader() {

package/src/views/layout/components/Menubar/index.vue

@@ -38,6 +38,7 @@ import tabJs from '../../../../api/tab'
 import {getI18nName} from '../../../../utils/menu'
 import Cookies from 'js-cookie'
 import {getMenus} from '../../../../utils/permissionAuth'
+import authApi from "../../../../utils/auth-api"
 
 export default {
 	name: 'Menubar',
@@ -64,13 +65,15 @@ export default {
 			}
 		}
 		const isSelectFirst = window.$vueApp.config.globalProperties.showFirstMenu === undefined ||  window.$vueApp.config.globalProperties.showFirstMenu === null? true : window.$vueApp.config.globalProperties.showFirstMenu
+		let isDevp = authApi.isDevpSystem()
 		const menus = getMenus()
 		return {
 			firstLeafMenu: null, // 第一个有权限的叶子菜单，用于默认展开第一个父菜单
 			systemName,
 			defaultActive: '',
 			menus,
-			isSelectFirst
+			isSelectFirst,
+			isDevp
 		}
 	},
 	computed: {
@@ -131,7 +134,11 @@ export default {
 				}
 				const path = this.firstLeafMenu.fullPath
 				this.addTabs(query, this.$store.state.tabContent.openTab, path, path)
-				this.$router.push({path: '/tab-content-index', query: query})
+				let routePath = '/tab-content-index'
+				if(this.isDevp){
+					routePath = '/devp-project/setting'
+				}
+				this.$router.push({path: routePath , query: query})
 				// this.$router.push({ path: this.firstLeafMenu.fullPath })
 			}
 		}