agilebuilder-ui 1.1.3 → 1.1.4-temp2

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

@@ -179,6 +179,11 @@ export default {
     openTree: {
       type: Boolean,
       default: true
+    },
+    // 当前表单变量数据信息
+    pageModels: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -214,8 +219,20 @@ export default {
       }
     },
     getPropName(prop, isJoinTable, tableName) {
+      if (prop && prop.startsWith('${')) {
+        // 格式是：${page.xxx} 或 ${data.xxx}
+        prop = prop.substring(prop.indexOf('.')+1, prop.length - 1)
+      }
       return getPropNameWhenJoinTable(prop, isJoinTable, tableName)
     },
+    getPropType(prop) {
+      let type = 'data'
+      if (prop && prop.startsWith('${')) {
+        // 格式是：${page.xxx} 或 ${data.xxx}
+        type = prop.substring(2, prop.indexOf('.'))
+      }
+      return type
+    },
     // 清空已选的结果
     emptyOrganizationResult() {
       const orgFields = this.fields
@@ -225,7 +242,8 @@ export default {
           // 人员时：id、name、loginName、email、telephone
           // 部门或工作组时：id、name
           const model = this.getPropName(orgField.model)
-          this.setValue(model, null)
+          const propType = this.getPropType(orgField.model)
+          this.setValue(model, null, propType)
         })
         this.selectOrganizationAllInfo = {}
         this.selectOrganizationInfo = null
@@ -255,34 +273,43 @@ export default {
           const orgDataType = orgField.type
           const orgSelectData = this.getOrgSelectData(orgDataType, orgData, this.isUserTree(treeType), isMulti)
           const model = this.getPropName(orgField.model)
-          this.getOrgDataModel(model, orgSelectData, isMulti, orgDataType, isRemove, removeItems)
+          const propType = this.getPropType(orgField.model)
+          this.getOrgDataModel(model, orgSelectData, isMulti, orgDataType, isRemove, removeItems, propType)
         })
       }
     },
     /**
      * @param orgDataType 字段属性：id、name、loginName、code、email、telephone
      */
-    getOrgDataModel(model, orgSelectData, isMulti, orgDataType, isRemove, removeItems) {
+    getOrgDataModel(model, orgSelectData, isMulti, orgDataType, isRemove, removeItems, propType) {
       if (isMulti) {
         // 表示是替换或添加操作
-        const orgResult = this.getModelValue(model)
+        const orgResult = this.getModelValue(model, propType)
         // 表示替换结果
         this.selectOrganizationAllInfo[orgDataType] = orgSelectData
-        this.setValue(model, orgSelectData)
+        this.setValue(model, orgSelectData, propType)
         // 参数分别为：属性名、原来的值、新替换的值
         this.$emit('replace', model, orgResult, orgSelectData)
       } else {
-        this.setValue(model, orgSelectData)
+        this.setValue(model, orgSelectData, propType)
       }
     },
-    getModelValue(model) {
+    getModelValue(model, propType) {
+      let models = this.models
+      if(propType && propType === 'page') {
+        models = this.pageModels
+      }
       let modelValue = ''
       if (this.isJoinTable === false && model && model.indexOf('.') > 0) {
-        const parentObj = this.getParentObject(model, this.models)
+        const parentObj = this.getParentObject(model, models)
         modelValue = parentObj[model.substring(model.lastIndexOf('.') + 1)]
       } else {
-        model = this.getPropName(model)
-        modelValue = this.models[model]
+        const name = this.getPropName(model)
+        if(propType && propType === 'page') {
+          modelValue = models?models[name]: null
+        } else {
+          modelValue = models[name]
+        }
       }
       return modelValue
     },
@@ -469,7 +496,8 @@ export default {
             const fieldSetting = fieldSettings[0]
             if (fieldSetting) {
               const model = this.getPropName(fieldSetting.model)
-              const selectInfo = this.getModelValue(model)
+              const propType = this.getPropType(fieldSetting.model)
+              const selectInfo = this.getModelValue(model, propType)
               if (selectInfo && selectInfo !== null && selectInfo !== '') {
                 this.selectOrganizationInfo = selectInfo
                 this.searchField = prop
@@ -491,20 +519,28 @@ export default {
         }
       }
     },
-    setValue(model, finallyOrgResult) {
-      if (this.models) {
+    setValue(model, finallyOrgResult, propType) {
+      if(!propType) {
+          propType = this.getPropType(model)
+      }
+      let models = this.models
+      if(propType && propType === 'page') {
+        models = this.pageModels
+      }
+      this.setEntityValue(model, finallyOrgResult, models)
+    },
+    setEntityValue(model, finallyOrgResult, models) {
+      if (models) {
         if (this.isJoinTable === false && model && model.indexOf('.') > 0) {
-          const parentObj = this.getParentObject(model, this.models)
+          const parentObj = this.getParentObject(model, models)
           if (parentObj) {
             setEntityFieldValue(parentObj, model.substring(model.lastIndexOf('.') + 1), finallyOrgResult)
-            // Vue.set(parentObj, model.substring(model.lastIndexOf('.') + 1), finallyOrgResult)
           }
         } else {
-          model = this.getPropName(model)
-          setEntityFieldValue(this.models, model, finallyOrgResult)
-          // Vue.set(this.models, model, finallyOrgResult)
+          const name = this.getPropName(model)
+          setEntityFieldValue(models, name, finallyOrgResult)
         }
-        console.log('this.value', this.models)
+        console.log('this.value===models=', models)
         // 调用setValue事件
         this.$emit('setValue', model, finallyOrgResult)
         if (finallyOrgResult === undefined || finallyOrgResult === null || finallyOrgResult === '') {

package/packages/super-grid/src/custom-formatter.js

@@ -239,16 +239,22 @@ const customFormatter = {
       jumpPageJson = this.rowLinkConfigMapping[rowIndex]
     }
     if (jumpPageJson && jumpPageJson !== '') {
+      // 解析是否需要显示该超链接
+      const jumpPageSetting = JSON.parse(jumpPageJson)
+      this.jumpPageLink(column, row, listCode, rowIndex, jumpPageSetting)
+    }
+  },
+  jumpPageLink(column, row, listCode, rowIndex, jumpPageSetting) {
+    if (jumpPageSetting) {
       // 解析是否需要显示该超链接
       let canClick = true
       const gridParams = store.get(listCode)
-      const jumpPageSetting = JSON.parse(jumpPageJson)
-      console.log('gupre-grid---clickHyperLink--jumpPageSetting=', jumpPageSetting)
+      console.log('super-grid---jumpPageLink--jumpPageSetting=', jumpPageSetting)
       if (jumpPageSetting.beforeClick) {
         const funName = jumpPageSetting.beforeClick
-        console.log('gupre-grid---clickHyperLink--jumpPageSetting.beforeClick=', funName)
+        console.log('super-grid---jumpPageLink--jumpPageSetting.beforeClick=', funName)
         console.log(
-          'gupre-grid---clickHyperLink--gridParams.options[eventCallBack]=',
+          'super-grid---jumpPageLink--gridParams.options[eventCallBack]=',
           gridParams.options['eventCallBack']
         )
         if (
@@ -281,11 +287,11 @@ const customFormatter = {
     if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
       parentFormData = gridParams.options.extraParam.entityMap
     }
-    console.log('ridParams.options.extraParam.entityMap', gridParams.options.extraParam)
+    console.log('gridParams.options.extraParam.entityMap', gridParams.options.extraParam)
 
     /// 把父页面的pageData传给弹出的页面或新页签
     const copyPageData = JSON.parse(
-      JSON.stringify(gridParams.pageContext && gridParams.pageContext.page ? gridParams.pageContext.page : {})
+      JSON.stringify(gridParams.pageContext && gridParams.pageContext.entity && gridParams.pageContext.entity.page ? gridParams.pageContext.entity.page : {})
     )
     jumpPageSetting._pageData = copyPageData
     jumpToPage(
@@ -298,7 +304,7 @@ const customFormatter = {
       null,
       parentFormData
     ).then((openPageParams) => {
-      console.log('doClickHyperLink----openPageParams----', openPageParams)
+      console.log('doClickHyperLink----openPageParams2222----', openPageParams)
       if (openPageParams) {
         // 点击列表组件中某元素弹出的页面
         if (jumpPageSetting && typeof jumpPageSetting === 'string' && jumpPageSetting !== '') {
@@ -314,7 +320,7 @@ const customFormatter = {
         // 列点击时列属性名
         openPageParams._columnProp = column.prop
         // 通知父页面弹出页面
-        $emit(this, 'open-page', openPageParams)
+        this.$emit('open-page', openPageParams)
       }
     })
   },

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

@@ -140,7 +140,7 @@
       @input="cellEvent('input', $event, true)"
     />
     <!--必须有@input ,否则无法输入值-->
-    <el-input
+    <!-- <el-input
       v-else-if="type === 'input'"
       ref="item"
       v-model="innerValue"
@@ -159,6 +159,85 @@
       <template v-if="isShowScanIcon" #append>
         <SuperIcon iconValue="fa-barcode" @click="scanClick()"></SuperIcon>
       </template>
+    </el-input> -->
+    <el-input
+      v-else-if="type === 'input'"
+      ref="item"
+      :disabled="disabled"
+      :maxlength="controlConfig && controlConfig.maxlength ? controlConfig.maxlength : ''"
+      :minlength="controlConfig && controlConfig.minlength ? controlConfig.minlength : ''"
+      :placeholder="$t('imatrixUIMessage.pleaseEnterContent')"
+      :title="innerValue"
+      clearable
+      v-model="innerValue"
+      @blur="cellEvent('blur', $event)"
+      @change="cellEvent('change', $event)"
+      @clear="cellEvent('clear', $event)"
+      @focus="cellEvent('focus', $event)"
+      @input="cellEvent('input', $event, true)"
+    >
+      <template
+        v-if="
+          designProperty.iconPosition != 'outer' &&
+          ((designProperty.preIconType && designProperty.preIconValue) || designProperty.preText)
+        "
+        #prefix
+      >
+        <SuperIcon
+          v-if="designProperty.preIconType && designProperty.preIconValue"
+          :iconType="designProperty.preIconType"
+          :iconValue="designProperty.preIconValue"
+          @click="doClickwithJumpPage('prefixClick')"
+        ></SuperIcon>
+        <span v-if="designProperty.preText">{{ $t(designProperty.preText) }}</span>
+      </template>
+      <template
+        v-if="
+          designProperty.iconPosition == 'outer' &&
+          ((designProperty.preIconType && designProperty.preIconValue) || designProperty.preText)
+        "
+        #prepend
+      >
+        <SuperIcon
+          v-if="designProperty.preIconType && designProperty.preIconValue"
+          :iconType="designProperty.preIconType"
+          :iconValue="designProperty.preIconValue"
+          @click="doClickwithJumpPage('prefixClick')"
+        ></SuperIcon>
+        <span v-if="designProperty.preText">{{ $t(designProperty.preText) }}</span>
+      </template>
+      <template
+        v-if="
+          designProperty.iconPosition != 'outer' &&
+          ((designProperty.sufIconType && designProperty.sufIconValue) || designProperty.sufText)
+        "
+        #suffix
+      >
+        <SuperIcon
+          v-if="designProperty.sufIconType && designProperty.sufIconValue"
+          :iconType="designProperty.sufIconType"
+          :iconValue="designProperty.sufIconValue"
+          @click="doClickwithJumpPage('suffixClick')"
+        ></SuperIcon>
+        <span v-if="designProperty.sufText">{{ $t(designProperty.sufText) }}</span>
+      </template>
+      <template
+        v-if="
+          isShowScanIcon ||
+          (designProperty.iconPosition == 'outer' &&
+            ((designProperty.sufIconType && designProperty.sufIconValue) || designProperty.sufText))
+        "
+        #append
+      >
+        <SuperIcon v-if="isShowScanIcon" iconValue="fa-barcode" @click="scanClick()"></SuperIcon>
+        <SuperIcon
+          v-if="designProperty.sufIconType && designProperty.sufIconValue"
+          :iconType="designProperty.sufIconType"
+          :iconValue="designProperty.sufIconValue"
+          @click="doClickwithJumpPage('suffixClick')"
+        ></SuperIcon>
+        <span v-if="designProperty.sufText">{{ $t(designProperty.sufText) }}</span>
+      </template>
     </el-input>
 
     <el-input
@@ -346,8 +425,6 @@
       :disabled="disabled"
       :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)"
     />
@@ -442,6 +519,7 @@ import { $emit } from '../../utils/gogocodeTransfer'
 import eventBus from './eventBus'
 import { isMobileBrowser } from '../../../src/utils/common-util'
 import { analysisScanValue, setScanAnalysisValue } from './scan-util.ts'
+import customFormatter from './custom-formatter'
 export default {
   name: 'DynamicInput',
   components: {
@@ -577,6 +655,10 @@ export default {
     if (!baseURL) {
       baseURL = window.$vueApp.config.globalProperties.baseURL
     }
+    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)
     return {
       deptManTree: false, // 是否是部门人员树
       isMultiTree: false, // 是否是多选树
@@ -638,7 +720,9 @@ export default {
       isApk,
       isShowBrowserScan: false,
       isShowScanIcon,
-      baseURL
+      baseURL,
+      colConfigure, // v10字段配置原信息
+      designProperty // 字段配置
     }
   },
   computed: {},
@@ -818,6 +902,7 @@ export default {
     eventBus.$off(this.componentId + '-scanDone')
   },
   methods: {
+    ...customFormatter,
     /**
      * @author: 梁旭
      * @description: 获取提示标题
@@ -1797,11 +1882,12 @@ export default {
           } else {
             return 0
           }
-        } else if (switchProp === 'offColor') {
-          return '#ff4949'
-        } else if (switchProp === 'onColor') {
-          return '#13ce66'
         }
+        //  else if (switchProp === 'offColor') {
+        //   return '#ff4949'
+        // } else if (switchProp === 'onColor') {
+        //   return '#13ce66'
+        // }
       }
     },
     scanClick() {
@@ -1847,6 +1933,35 @@ export default {
       if (columnRule.required !== undefined) {
         this.$emit('change-required', columnRule.required)
       }
+    },
+    doClickwithJumpPage(eventName) {
+      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)) {
+        // 表示有跳转页面配置
+        const jumpJson = JSON.parse(JSON.stringify(linkPage))
+        if (jumpJson && Array.isArray(jumpJson)) {
+          format.multPage = true
+          jumpJson.forEach((item) => {
+            if (
+              item.jumpPageSetting.displayTextJudge &&
+              item.jumpPageSetting.dynamicTags &&
+              item.jumpPageSetting.dynamicTags.length > 0
+            ) {
+              item.jumpPageSetting.displayText = item.jumpPageSetting.dynamicTags.join('-#-#')
+            }
+          })
+        } else {
+          if (jumpJson.displayTextJudge && jumpJson.dynamicTags && jumpJson.dynamicTags.length > 0) {
+            jumpJson.displayText = jumpJson.dynamicTags.join('-#-#')
+          }
+        }
+        this.jumpPageLink(this.column, this.row, this.listCode, this.rowIndex, jumpJson)
+      } else {
+        // 表示没有跳转页面配置
+        this.callCustomEvent(eventName) 
+      }
     }
   }
 }

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

@@ -30,6 +30,7 @@
       @refresPortsData="refresPortsData"
       @change-disabled="changeDisabled"
       @change-required="changeRequired"
+      @open-page="openPageEvent"
     />
     <span v-else>
       <span v-if="column.operations" class="grid-operation-buttons">
@@ -1030,6 +1031,10 @@ export default {
     },
     changeRequired(required) {
       this.requiredClass = required? 'm-requried' : ''
+    },
+    openPageEvent(openPageParams) {
+      console.log('normalColumnContent----openPageEvent----', openPageParams)
+      this.$emit('open-page', openPageParams)
     }
   },
   emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']

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

@@ -352,6 +352,7 @@ export default {
       this.$emit('refresh-list')
     },
     openPageEvent(openPageParams) {
+      console.log('normalColumn----openPageEvent----', openPageParams)
       this.$emit('open-page', openPageParams)
     }
   },

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

@@ -404,6 +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
@@ -1278,6 +1279,8 @@ export default {
         baseURL = window.$vueApp.config.globalProperties.baseURL
       }
       this.baseURL = baseURL
+      // 封装v10字段配置
+      gridParams.colConfigureMap = this.packageListColumnSetting()
     },
     changeRowStyle(param) {
       // param的格式：{row, rowIndex}
@@ -3123,6 +3126,31 @@ export default {
         params.additionalParamMap = params.additionalParamMap || {}
         Object.assign(params.additionalParamMap, additionalParamMap)
       }
+    },
+    // 封装v10字段配置，key是数据库字段名（属性名），value是该字段的配置
+    packageListColumnSetting() {
+       // key是属性名，value是字段配置
+      let colConfigureMap = {}
+      if(this.configureObj){
+        const colItems = this.configureObj.items
+        if(colItems) {
+          colItems.forEach((colConfigure)=>{
+            const propName = this.getFormPropName(colConfigure.props.base.prop)
+            if(propName){
+              colConfigureMap[propName] = colConfigure
+            }
+          })
+        }
+      }
+      return colConfigureMap
+    },
+    // prop的格式是${data.MY_NAME}
+    getFormPropName(prop) {
+      if (prop && prop.indexOf('${') >= 0) {
+        return prop.substring(prop.indexOf('.') + 1, prop.lastIndexOf('}'))
+      } else {
+        return prop
+      }
     }
   },
   emits: [

package/src/styles/index.scss

@@ -160,3 +160,35 @@ body .el-table colgroup.gutter {
   margin-left: 10px;
 }
 
+// v10图表样式
+.amb-widget-chart {
+  --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-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);
+  margin-bottom: 18px;
+}
+
+.amb-widget-chart-header {
+  border-bottom: 1px solid var(--el-card-border-color);
+  padding: 6px 10px;
+  display: flex;
+  min-height: 36px;
+}
+.amb-widget-chart-header-item {
+  display: flex;
+  align-items: center;
+}
+.amb-widget-chart-header-center {
+  flex-grow: 1;
+  text-align: center;
+  vertical-align: middle;
+  justify-content: center;
+}

package/src/styles/table.scss

@@ -1,12 +1,12 @@
 .ocean-blue,.green,.dark-blue{
   .el-table th.el-table__cell {
-    background-color: transparent;
+    background-color: $th-background-color;
   }
   .el-table.is-scrolling-right th.el-table-fixed-column--right{
-    background-color: transparent;
+    background-color: $th-background-color;
   }
   .el-table.is-scrolling-left th.el-table-fixed-column--left{
-    background-color: transparent;
+    background-color: $th-background-color;
   }
 }
 

package/src/styles/theme/dark-blue/dark-blue-var.scss

@@ -7,3 +7,4 @@ $--button-default-font-color: $--color-primary;
 $--button-primary-btn-color: $--color-primary;
 $--button-opt-background-color: #0780ED;
 $th-cell-background: #F0F8FE;
+$th-background-color: #F2F3F8;

package/src/styles/theme/green/green.scss

@@ -20,3 +20,4 @@ $--card-header-color: $--color-card;
 
 $--menu-hove-background-color: $--color-primary;
 $th-cell-background: #EDEDED;
+$th-background-color: #F2F3F8;

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

@@ -19,3 +19,4 @@ $--card-header-color: $--color-card;
 
 $--menu-hove-background-color: $--color-hover;
 $th-cell-background: #EDEDED;
+$th-background-color: #F2F3F8;

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

@@ -236,6 +236,15 @@ export function jumpToPage(
           paramMap.jumpPageTitle = jumpPageSetting.jumpPageTitle
           // 表单页面
           paramMap.entity = entity
+          // 把pageData封装到附加参数中
+          let pageData = jumpPageSetting._pageData
+          if (!pageData) {
+            pageData = {}
+          }
+          if(!additionalParamMap){
+            additionalParamMap = {}
+          }
+          Object.assign(additionalParamMap, pageData)
           paramMap.additionalParamMap = additionalParamMap
           console.log('paramMap.parentFormData', parentFormData)
           paramMap.parentFormData = parentFormData