agilebuilder-ui 1.1.1 → 1.1.2-tmp2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.1",
+  "version": "1.1.2-tmp2",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",
@@ -28,6 +28,7 @@
     "axios": "^1.5.1",
     "element-plus": "^2.4.1",
     "nprogress": "^0.2.0",
+    "rollup-plugin-terser": "^7.0.2",
     "sass": "1.69.4",
     "vite": "^4.4.5",
     "vite-plugin-require-transform": "^1.0.21",

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,7 +287,7 @@ 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(

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>
+        {{ $t(designProperty.preText) }}
+      </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>
+        {{ $t(designProperty.preText) }}
+      </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>
+        {{ $t(designProperty.sufText) }}
+      </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>
+        {{ $t(designProperty.sufText) }}
+      </template>
     </el-input>
 
     <el-input
@@ -442,6 +521,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 +657,9 @@ export default {
     if (!baseURL) {
       baseURL = window.$vueApp.config.globalProperties.baseURL
     }
+    const colConfigure = gridParams.colConfigureMap ? gridParams.colConfigureMap[this.column.prop] : null
+    const runtimeInfo = colConfigure.runtime ? colConfigure.runtime : {}
+    const designProperty = runtimeInfo.props ? runtimeInfo.props : {}
     return {
       deptManTree: false, // 是否是部门人员树
       isMultiTree: false, // 是否是多选树
@@ -638,7 +721,9 @@ export default {
       isApk,
       isShowBrowserScan: false,
       isShowScanIcon,
-      baseURL
+      baseURL,
+      colConfigure, // v10字段配置原信息
+      designProperty // 字段配置
     }
   },
   computed: {},
@@ -1847,6 +1932,34 @@ export default {
       if (columnRule.required !== undefined) {
         this.$emit('change-required', columnRule.required)
       }
+    },
+    doClickwithJumpPage(eventName) {
+      let configureObj = this.colConfigure
+      let linkPage = configureObj.props.linkPage
+      if (eventName && (eventName === 'click' || eventName === 'prefixClick'  || eventName === 'suffixClick' ) && (linkPage && linkPage.jumpPageUrl)) {
+        // 表示有跳转页面配置
+        const jumpJson = JSON.parse(JSON.stringify(item.props.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('-#-#')
+          }
+        }
+        customFormatter.jumpPageLink(this.column, this.row, this.listCode, this.rowIndex, jumpJson)
+      } else {
+        // 表示没有跳转页面配置
+        this.callCustomEvent(eventName) 
+      }
     }
   }
 }

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 = 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/vite.config.js

@@ -1,9 +1,18 @@
 import { defineConfig } from "vite";
 import vue from "@vitejs/plugin-vue";
 import path from "path";
+import { terser } from 'rollup-plugin-terser'
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [vue()],
+  plugins: [
+    vue(),  
+    // terser({
+    //   compress: {
+    //     drop_console: true,
+    //     drop_debugger: true
+    //   }
+    // })
+  ],
   build: {
     outDir: "lib", //输出文件名称
     lib: {