agilebuilder-ui 1.0.621 → 1.0.962

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

@@ -155,7 +155,7 @@ const apis = {
           const isSubTableShowPage = gridParams.isSubTableShowPage
           // 每页显示多少条
           const pageSize = gridParams.pagination && gridParams.pagination.pageSize
-          const isMobile = false
+          const isMobile = this.isMobile
           if(gridParams.pageContext){
           canCreate = gridParams.options.lineEditOptions.beforeInsertRow.call(
             this,{gridData:isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
@@ -306,7 +306,7 @@ const apis = {
             // 每页显示多少条
             const pageSize =
               gridParams.pagination && gridParams.pagination.pageSize
-            const isMobile = false
+            const isMobile = this.isMobile
             
             if(gridParams.pageContext){
               gridParams.options.lineEditOptions.afterInsertRow.call(
@@ -419,11 +419,11 @@ const apis = {
           // 不是操作列，才需要设值
           const defaultValueSet = column.defaultValue
           let defaultValue = null
-          console.log('setColumnsDefaultValue111------getDefaultValueFunc--', getDefaultValueFunc, 'column=',column,'defaultValueSet=', defaultValueSet)
+          //console.log('setColumnsDefaultValue111------getDefaultValueFunc--', getDefaultValueFunc, 'column=',column,'defaultValueSet=', defaultValueSet)
           if(getDefaultValueFunc) {
-            console.log('setColumnsDefaultValue22---getDefaultValueFunc222---')
+            //console.log('setColumnsDefaultValue22---getDefaultValueFunc222---')
             defaultValue = getDefaultValueFunc(gridParams.pageContext, defaultValueSet, null, null)
-            console.log('setColumnsDefaultValue33---defaultValue---', defaultValue)
+            //console.log('setColumnsDefaultValue33---defaultValue---', defaultValue)
             if(defaultValue === undefined) {
               defaultValue = null
             }
@@ -901,7 +901,7 @@ const apis = {
         const isSubTableShowPage = gridParams.isSubTableShowPage
         // 每页显示多少条
         const pageSize = gridParams.pagination && gridParams.pagination.pageSize
-        const isMobile = false
+        const isMobile = this.isMobile
         isValidate =
           gridParams.options.lineEditOptions.beforeRestoreValidate.call(this, {
             rowIndex,
@@ -942,7 +942,7 @@ const apis = {
         const isSubTableShowPage = gridParams.isSubTableShowPage
         // 每页显示多少条
         const pageSize = gridParams.pagination && gridParams.pagination.pageSize
-        const isMobile = false
+        const isMobile = this.isMobile
         canRestore = gridParams.options.lineEditOptions.beforeRestore.call(
           this,
           {
@@ -1055,7 +1055,7 @@ const apis = {
         const gridData = isSubTableShowPage
           ? gridParams.subTableData
           : gridParams.gridData
-        const isMobile = false
+        const isMobile = this.isMobile
         if(gridParams.pageContext){
           canDelete = gridParams.options.lineEditOptions.beforeDelete.call(
             this,{
@@ -1127,14 +1127,14 @@ const apis = {
           gridParams.superGrid.clearSelection()
         }
         gridParams.isCreateRow = false
-        if (isRestore !== undefined && isRestore === true) {
+        if (isRestore === undefined || !isRestore) {
           // 表示是删除操作，执行删除记录后回调
           if (isEditOptionFunction('afterDelete', listCode)) {
             const isSubTableShowPage = gridParams.isSubTableShowPage
             // 每页显示多少条
             const pageSize =
               gridParams.pagination && gridParams.pagination.pageSize
-            const isMobile = false
+            const isMobile = this.isMobile
             if(gridParams.pageContext){
               gridParams.options.lineEditOptions.afterDelete.call(
                 this,{
@@ -1224,6 +1224,26 @@ const apis = {
     })
     return result
   },
+    // 获得该列表中，下拉选是选项组的字段信息，返回的key是属性名，value是选项集合
+    getTableSelectOptions(listCode) {
+      const result = {}
+      if (!listCode) {
+        listCode = store.get('_list_code')
+      }
+      const gridParams = store.get(listCode)
+      const columns = gridParams.columns
+      columns.forEach(col => {
+        const prop = col.prop
+        const isDynamicDataSource = isDynamicDataSourceSource(col)
+        if (!isDynamicDataSource && col.valueSet && col.valueSet.length > 0) {
+          result[prop] = {
+            options: col.valueSet,
+            column: col
+          }
+        }
+      })
+      return result
+    },
   // 取消列表的编辑状态
   restoreGridEdit(listCode) {
     if (!listCode) {
@@ -1375,6 +1395,134 @@ const apis = {
       gridParams.subTableData = gridData
       this.subTableData = gridData
     }
+  },
+  // 获得默认值字段集合
+  getDefaultValueColumns(listCode) {
+    const defaultValueColumnsMap = {}
+    const gridParams = store.get(listCode)
+    const defaultValueColumns = gridParams.defaultValueColumns
+    if (defaultValueColumns && defaultValueColumns.length > 0) {
+      defaultValueColumns.forEach(column => {
+        defaultValueColumnsMap[column.prop] = column.defaultValue
+      })
+    }
+    return defaultValueColumnsMap
+  },
+  // 重新刷新子表数据
+  reloadSubTableData(listCode) {
+    const gridParams = store.get(listCode)
+    gridParams.options['subTableData'] = null
+    this.fetchListData()
+  },
+    /**
+     * v10 行编辑时动态控制字段的编辑权限
+     * @param pageContext 页面解析的上下文对象
+     * @param customRules 格式如下：
+     * [
+        {
+          name: '_all_fields', // _all_fields 表示所有字段
+          disabled: true,
+          required: true,
+          rules: [
+            {
+              required: true,
+              trigger: 'blur'
+            },
+            {
+              type: 'email',
+              trigger: ['blur', 'change']
+            }
+          ]
+        },
+        {
+          name: 'xxxx',
+          disabled: true,
+          required: true,
+          rules: [
+            {
+              required: true,
+              message: 'Please input email address',
+              trigger: 'blur'
+            },
+            {
+              type: 'email',
+              message: 'Please input correct email address',
+              trigger: ['blur', 'change']
+            }
+          ]
+        }
+      ]
+     */
+  dynamicControlTableEdit(pageContext, customRules, listCode){
+    const gridParams = store.get(listCode)
+    // console.log('dynamicControlTableEdit----customRules-----', customRules, gridParams.options.customRules)
+    if(!customRules){
+      return
+    }
+    let gridCustomRules = {}
+    if(gridParams.options.customRules){
+      gridCustomRules = JSON.parse(JSON.stringify(gridParams.options.customRules))
+    }
+    customRules.forEach(item=>{
+      const copyItem = JSON.parse(JSON.stringify(item))
+      const prop = item.name
+      // 当前列新的自定义规则集合
+      let columnRules
+      if(!gridCustomRules[prop]){
+        gridCustomRules[prop] = {}
+      }
+      // console.log('dynamicControlTableEdit----gridCustomRules111-----', gridCustomRules)
+      // 获得当前列已有的自定义规则集合
+      columnRules = gridCustomRules[prop].rules
+      
+      if(copyItem.rules){
+        if(!columnRules){
+          columnRules = []
+        }
+        // 将当前列自定义规则集合拼接到已有的自定义规则集合中
+        columnRules = columnRules.concat(copyItem.rules)
+      }
+      // 当前列总的自定义规则更新
+      copyItem.rules = columnRules
+      // this.options.customRules[prop] = copyItem
+      if(!gridParams.options.customRules){
+        gridParams.options.customRules = {}
+      }
+      // console.log('dynamicControlTableEdit----gridParams.options.customRules222-----', gridParams.options.customRules)
+      gridParams.options.customRules[prop] = copyItem
+    })
+    // console.log('dynamicControlTableEdit----gridParams.options.customRules333-----', gridParams.options.customRules)
+  },
+  doLayout(hiddenColumns, listCode) {
+    if(!listCode){
+      listCode = this.code
+    }
+    const gridParams = store.get(listCode)
+    const orgHiddenColumns = gridParams.hiddenColumns
+    // console.log('doLayout----orgHiddenColumns=', orgHiddenColumns)
+    if(hiddenColumns && hiddenColumns.length > 0){
+      let hiddenColumnsResult = orgHiddenColumns
+      if(!hiddenColumnsResult){
+        hiddenColumnsResult = []
+      }
+      if(hiddenColumnsResult.length === 0){
+        hiddenColumnsResult = hiddenColumns
+      } else {
+        hiddenColumns.forEach(prop=>{
+          if(hiddenColumnsResult.indexOf(prop) < 0) {
+            // 去重处理
+            hiddenColumnsResult.push(prop)
+          }
+        })
+      }
+      // console.log('doLayout----hiddenColumnsResult=', hiddenColumnsResult)
+      this.options.hiddenColumns = hiddenColumnsResult
+    } else {
+      this.options.hiddenColumns = orgHiddenColumns
+    }
+    if (this.$refs && this.$refs.superGrid) {
+      this.$refs.superGrid.doLayout()
+    }
   }
 }
 export default apis

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

@@ -13,10 +13,9 @@
       </el-tag>
     </span>
     <span v-else :style="customStyle">
-      <i v-if="formatConfig.position==='pre'" :class="formatConfig.icon" />
-      <span v-if="formatConfig.displayTextJudge" class="cell--span">{{ displayText }}
-      </span>
-      <i v-if="formatConfig.position==='suf'" :class="formatConfig.icon" />
+      <i v-if="formatConfig.position === 'pre'" :class="formatConfig.icon" />
+      <span v-if="formatConfig.displayTextJudge" class="cell--span">{{ displayText }} </span>
+      <i v-if="formatConfig.position === 'suf'" :class="formatConfig.icon" />
     </span>
   </span>
 </template>
@@ -69,14 +68,11 @@ export default {
   created() {
     this.initFomrat()
   },
-  mounted() {
-
-  },
+  mounted() {},
   methods: {
     ...customFormatter,
     initFomrat() {
-			    if (this.column.formatter &&
-    this.column.formatter.options && this.column.formatter.options.format) {
+      if (this.column.formatter && this.column.formatter.options && this.column.formatter.options.format) {
         this.formatConfig = JSON.parse(this.column.formatter.options.format)
         Object.assign(this.formatConfig, this.getFormatIconSetting(this.row))
         console.log(this.formatConfig, '-------------------')
@@ -143,7 +139,7 @@ export default {
       if (gridParams.options['eventCallBack'] && gridParams.options['eventCallBack'][this.formatConfig.event]) {
         const customEventResult = gridParams.options['eventCallBack'][this.formatConfig.event].call(this, params)
         if (isPromise(customEventResult)) {
-          await customEventResult.then(result => {
+          await customEventResult.then((result) => {
             console.log('点击前事件返回结果--Promise--resolve---', result)
             this.customStyle = result
           })
@@ -153,10 +149,7 @@ export default {
       }
     }
   }
-
 }
 </script>
 
-<style>
-
-</style>
+<style></style>

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

@@ -1,8 +1,19 @@
 <template>
   <span>
-    <el-link :type="getLinkType(row)" @click="clickHyperLink(column, row, listCode,scopeIndex)">
-      <span v-if="isShowOverflowTooltip" :id="column.prop+'DomData'+scopeIndex" :title="$escapeHtml(getMyHyperLinkSetting(row).title)" :style="{width:cellWidth+'px'}" class="ellipsis cell--span">{{ $escapeHtml(getMyHyperLinkSetting(row).label) }}<i v-if="getMyHyperLinkSetting(row).icon" :class="getMyHyperLinkSetting(row).icon" /></span>
-      <span v-else :id="column.prop+'DomData'+scopeIndex" class="cell--span">{{ $escapeHtml(getMyHyperLinkSetting(row).label) }}<i v-if="getMyHyperLinkSetting(row).icon" :class="getMyHyperLinkSetting(row).icon" /></span>
+    <el-link :type="getLinkType(row)" @click="clickHyperLink(column, row, listCode, scopeIndex)">
+      <span
+        v-if="isShowOverflowTooltip"
+        :id="column.prop + 'DomData' + scopeIndex"
+        :title="$escapeHtml(getMyHyperLinkSetting(row).title)"
+        :style="{ width: cellWidth + 'px' }"
+        class="ellipsis cell--span"
+        >{{ $escapeHtml(getMyHyperLinkSetting(row).label)
+        }}<i v-if="getMyHyperLinkSetting(row).icon" :class="getMyHyperLinkSetting(row).icon"
+      /></span>
+      <span v-else :id="column.prop + 'DomData' + scopeIndex" class="cell--span"
+        >{{ $escapeHtml(getMyHyperLinkSetting(row).label)
+        }}<i v-if="getMyHyperLinkSetting(row).icon" :class="getMyHyperLinkSetting(row).icon"
+      /></span>
     </el-link>
   </span>
 </template>
@@ -48,7 +59,15 @@ export default {
       if (gridParams && gridParams.basicInfo && gridParams.basicInfo.tableName) {
         tableName = gridParams.basicInfo.tableName
       }
-      const hyperLinkResult = this.getHyperLinkSetting(this.column, row, this.isSql, gridParams.additionalParamMap, gridParams.contextParameter, tableName, this.listCode)
+      const hyperLinkResult = this.getHyperLinkSetting(
+        this.column,
+        row,
+        this.isSql,
+        gridParams.additionalParamMap,
+        gridParams.contextParameter,
+        tableName,
+        this.listCode
+      )
       hyperLinkResult.icon = this.getHyperIconClass(hyperLinkResult)
       return hyperLinkResult
     },
@@ -105,10 +124,7 @@ export default {
       return 'primary'
     }
   }
-
 }
 </script>
 
-<style>
-
-</style>
+<style></style>