agilebuilder-ui 1.1.32 → 1.1.33-sit2

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

@@ -28,7 +28,7 @@
   <div v-else :style="row.validateErrorField && row.validateErrorField === column.prop ? 'border:1px solid red' : ''">
     <!--必须有@input ,否则无法输入值-->
     <el-date-picker
-      v-if="type === 'year' || type === 'month'"
+      v-if="type === 'year' || type === 'month' || type === 'week'"
       ref="item"
       v-model="innerValue"
       :disabled="disabled"
@@ -1844,6 +1844,11 @@ export default {
       if (this.column.dataType === 'TEXT' || this.column.dataType === 'text') {
         return this.isFormat()
       }
+      if (this.type === 'week') {
+        if (this.controlConfig && this.controlConfig.valueFormat) {
+          return this.controlConfig.valueFormat
+        }
+      }
       // timestamp毫秒值为x
       return 'x'
     },
@@ -1862,6 +1867,11 @@ export default {
         return 'MM'
       } else if (this.type === 'date') {
         return 'YYYY-MM-DD'
+      } else if (this.type === 'week') {
+        if (this.controlConfig && this.controlConfig.format) {
+          return this.controlConfig.format
+        }
+        return 'ww'
       } else if (this.type === 'time' || this.column.dataType === 'TIME') {
         return 'HH:mm:ss'
       } else if (this.column.dataType === 'DATE') {

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

@@ -1,4 +1,7 @@
 import { isDynamicDataSourceSource } from './utils'
+import dayjs from 'dayjs'
+import weekOfYear from 'dayjs/plugin/weekOfYear'
+dayjs.extend(weekOfYear)
 const formatter = {
   number: function (inputValue, options) {
     // 小数位数
@@ -19,10 +22,7 @@ const formatter = {
       }
       if (isDelimiter) {
         const inputValueStr = inputValue + ''
-        const value = inputValueStr.replace(
-          /\d{1,3}(?=(\d{3})+(\.\d*)?$)/g,
-          '$&,'
-        )
+        const value = inputValueStr.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
         if (sign) {
           return value + sign
         } else {
@@ -65,47 +65,52 @@ const formatter = {
   date: function (value, options) {
     // format格式，例如：yyyy-m-d,yyyy-m-d hh:mm:ss等等
     const format = options.format
+
     if (value != null) {
-      const date = new Date(value)
-      var y = date.getFullYear()
-      var m = date.getMonth() + 1
-      var d = date.getDate()
-      var h = date.getHours()
-      var min = date.getMinutes()
-      var s = date.getSeconds()
-      if (m < 10) {
-        m = '0' + m
-      }
-      if (d < 10) {
-        d = '0' + d
-      }
-      // if (format.indexOf('hh') >= 0) {
-      //   h = h > 12 ? h - 12 : h
-      // } else {
-      if (h < 10) {
-        h = '0' + h
-      }
-      // }
-      if (min < 10) {
-        min = '0' + min
-      }
-      if (s < 10) {
-        s = '0' + s
-      }
-      const newValue = format
-        .replace('yyyy', y)
-        .replace('mm', min)
-        .replace('M', m)
-        .replace('m', m)
-        .replace('d', d)
-        .replace('hh', h)
-        .replace('HH', h)
-        .replace('ss', s)
-      // 判断格式化的值是否包含NaN，如果包含NaN取数据库的值
-      if (newValue.indexOf('NaN') === -1) {
-        return newValue
+      if (format === 'ww') {
+        return dayjs(value).week()
+      } else {
+        const date = new Date(value)
+        var y = date.getFullYear()
+        var m = date.getMonth() + 1
+        var d = date.getDate()
+        var h = date.getHours()
+        var min = date.getMinutes()
+        var s = date.getSeconds()
+        if (m < 10) {
+          m = '0' + m
+        }
+        if (d < 10) {
+          d = '0' + d
+        }
+        // if (format.indexOf('hh') >= 0) {
+        //   h = h > 12 ? h - 12 : h
+        // } else {
+        if (h < 10) {
+          h = '0' + h
+        }
+        // }
+        if (min < 10) {
+          min = '0' + min
+        }
+        if (s < 10) {
+          s = '0' + s
+        }
+        const newValue = format
+          .replace('yyyy', y)
+          .replace('mm', min)
+          .replace('M', m)
+          .replace('m', m)
+          .replace('d', d)
+          .replace('hh', h)
+          .replace('HH', h)
+          .replace('ss', s)
+        // 判断格式化的值是否包含NaN，如果包含NaN取数据库的值
+        if (newValue.indexOf('NaN') === -1) {
+          return newValue
+        }
+        return value
       }
-      return value
     }
     return value
   },
@@ -117,7 +122,7 @@ const formatter = {
       return this.number(value, options) + '%'
     }
     return value
-  },
+  }
 }
 
 export function doFormat(column, value) {
@@ -132,24 +137,21 @@ export function doFormat(column, value) {
       column.formatter = {
         type: 'date',
         options: {
-          format: 'yyyy-m-d',
-        },
+          format: 'yyyy-m-d'
+        }
       }
     } else if (column.dataType === 'TIME') {
       // 默认的“TIME”类型的格式设置
       column.formatter = {
         type: 'time',
         options: {
-          format: 'yyyy-m-d hh:mm:ss',
-        },
+          format: 'yyyy-m-d hh:mm:ss'
+        }
       }
     }
   }
   const columnFormatter = column.formatter
-  if (
-    columnFormatter !== undefined &&
-    formatter[columnFormatter.type] !== undefined
-  ) {
+  if (columnFormatter !== undefined && formatter[columnFormatter.type] !== undefined) {
     return formatter[columnFormatter.type](value, columnFormatter.options)
   } else {
     return value
@@ -163,10 +165,7 @@ export function doFormatWithValueSet(column, value) {
   const valueSet = column.valueSet
   // 先处理值设置再处理格式化设置：即会对值设置的结果进行格式化设置
   if (valueSet !== undefined) {
-    if (
-      column.componentType === 'multiselect' &&
-      !isDynamicDataSourceSource(column)
-    ) {
+    if (column.componentType === 'multiselect' && !isDynamicDataSourceSource(column)) {
       if (typeof value === 'number') {
         // 当value是0时， value instanceof Number 为false
         value += ''

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

@@ -35,9 +35,21 @@
       @open-page="openPageEvent"
     />
     <div v-else class="column-text-main">
-      <div v-if="lineEdit.editable && (options?.configureObj?.props?.base?.columnEditable ?? false) && isEditable && !isHideEdit && !isContentViewText" class="column-text-edit-main" @click="onEditing">
+      <div
+        v-if="
+          lineEdit.editable &&
+          (options?.configureObj?.props?.base?.columnEditable ?? false) &&
+          isEditable &&
+          !isHideEdit &&
+          !isContentViewText
+        "
+        class="column-text-edit-main"
+        @click="onEditing"
+      >
         <el-icon :size="14" color="#409eff"><Edit /></el-icon>
-        <span v-if="[undefined, null, ''].includes(row[column.prop])" table-column-placeholder>{{ $t('superGrid.editablePlaceholder') }}</span>
+        <span v-if="[undefined, null, ''].includes(row[column.prop])" table-column-placeholder>{{
+          $t('superGrid.editablePlaceholder')
+        }}</span>
       </div>
       <span v-if="column.operations" class="grid-operation-buttons" data-v="20250527">
         <span
@@ -64,29 +76,27 @@
                     :command="beforeHandleCommand(buttonChild.props.code, row, rowIndex)"
                     :disabled="preventReclick"
                   >
-                    {{
-                      $escapeHtml(buttonChild.props.label)
-                    }}
+                    {{ $escapeHtml(buttonChild.props.label) }}
                   </el-dropdown-item>
                 </span>
               </el-dropdown-menu>
             </template>
           </el-dropdown>
           <component
-              :is="operation.props.customControl"
-              v-else-if="operation.props.customControl"
-              v-permission="operation.props.permission"
-              :key="column.prop+'_'+rowIndex+'_'+currentPage"
-              :disabled="true"
-              :row="pageGridData[rowIndex]"
-              :entity="pageGridData[rowIndex]"
-              :prop="column.prop"
-              :parent="parentFormData"
-              :row-index="rowIndex"
-              :grid-data="gridData"
-              :page-grid-data="pageGridData"
-              :current-page="currentPage"
-              @refresh-list="refreshList"
+            :is="operation.props.customControl"
+            v-else-if="operation.props.customControl"
+            v-permission="operation.props.permission"
+            :key="column.prop + '_' + rowIndex + '_' + currentPage"
+            :disabled="true"
+            :row="pageGridData[rowIndex]"
+            :entity="pageGridData[rowIndex]"
+            :prop="column.prop"
+            :parent="parentFormData"
+            :row-index="rowIndex"
+            :grid-data="gridData"
+            :page-grid-data="pageGridData"
+            :current-page="currentPage"
+            @refresh-list="refreshList"
           />
           <row-operation
             v-else
@@ -96,6 +106,7 @@
             :is-show="operation.isShow"
             :label="operation.props.label ? operation.props.label : row[column.prop]"
             :on-click="operation.onClick"
+            :operation="operation"
             :operation-index="operationIndex"
             :operation-setting="operation.props"
             :row-index="rowIndex"
@@ -185,9 +196,9 @@
         <span v-if="column.formatter && column.formatter.type === 'files'" type="primary">
           <span
             :id="column.prop + 'DomData' + rowIndex"
-            :style="isShowForm ? {} : { width: cellWidth + 'px' }"
+            :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
             :title="isShowOverflowTooltip ? $escapeHtml(getLabel(row)) : ''"
-            :class="isShowForm ? '' : 'ellipsis cell--span'"
+            :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
           >
             <FsPreview
               :entity="row"
@@ -220,9 +231,9 @@
           <span
             v-if="isShowOverflowTooltip"
             :id="column.prop + 'DomData' + rowIndex"
-            :style="isShowForm ? {} : { width: cellWidth + 'px' }"
+            :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
             :title="getMyHyperLinkSetting(row, rowIndex).title"
-            :class="isShowForm ? '' : 'ellipsis cell--span'"
+            :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
             >{{ getMyHyperLinkSetting(row, rowIndex).label }}
             <el-icon v-if="getMyHyperLinkSetting(row, rowIndex).icon">
               <component :is="(getMyHyperLinkSetting(row), rowIndex.icon)" />
@@ -238,9 +249,9 @@
         <span
           v-else-if="isShowOverflowTooltip"
           :id="column.prop + 'DomData' + rowIndex"
-          :style="isShowForm ? {} : { width: cellWidth + 'px' }"
+          :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
           :title="$escapeHtml(getLabel(row))"
-          :class="isShowForm ? '' : 'ellipsis cell--span'"
+          :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
           >{{ $escapeHtml(getLabel(row, rowIndex)) }}</span
         >
         <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'">{{
@@ -252,9 +263,9 @@
           <span
             v-if="isShowOverflowTooltip"
             :id="column.prop + 'DomData' + rowIndex"
-            :style="isShowForm ? {} : { width: cellWidth + 'px' }"
+            :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
             :title="$escapeHtml(getLabel(row))"
-            :class="isShowForm ? '' : 'ellipsis cell--span'"
+            :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
           >
             <FsPreview
               :entity="row"
@@ -275,9 +286,9 @@
         <span v-else-if="column.formatter && column.formatter.type === 'files'">
           <span
             :id="column.prop + 'DomData' + rowIndex"
-            :style="isShowForm ? {} : { width: cellWidth + 'px' }"
+            :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
             :title="isShowOverflowTooltip ? $escapeHtml(getLabel(row)) : ''"
-            :class="isShowForm ? '' : 'ellipsis cell--span'"
+            :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
           >
             <FsPreview
               :entity="row"
@@ -301,9 +312,9 @@
           <span
             v-if="isShowOverflowTooltip"
             :id="column.prop + 'DomData' + rowIndex"
-            :style="isShowForm ? {} : { width: cellWidth + 'px' }"
+            :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
             :title="$escapeHtml(getMyHyperLinkSetting(row, rowIndex).title)"
-            :class="isShowForm ? '' : 'ellipsis cell--span'"
+            :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
             >{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
             <el-icon v-if="getMyHyperLinkSetting(row, rowIndex).icon">
               <component :is="getMyHyperLinkSetting(row, rowIndex).icon" />
@@ -334,10 +345,9 @@
         <span
           v-else-if="isShowOverflowTooltip"
           :id="column.prop + 'DomData' + rowIndex"
-          :style="isShowForm ? {} : { width: cellWidth + 'px' }"
+          :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
           :title="getLabel(row)"
-          :class="isShowForm ? '' : 'ellipsis cell--span'"
-          style="white-space: pre"
+          :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
           v-html="$escapeHtml(getLabel(row, rowIndex))"
         />
         <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'">{{
@@ -367,7 +377,8 @@ import {
   isRequiredEdit,
   getAdditionalParamMap,
   getContentAlign,
-  getHeaderAlign
+  getHeaderAlign,
+  isEditOptionFunction
 } from './utils'
 import DynamicInput from './dynamic-input.vue'
 import store from './store'
@@ -383,7 +394,8 @@ import FsPreview from '../../fs-preview'
 import RichEditorViewer from '../../rich-editor/viewer.vue'
 import GridIcon from './components/grid-icon.vue'
 import { formatScanRuleSets } from './scan-util.ts'
-import storeVuex from '../../../src/store';
+import storeVuex from '../../../src/store'
+import { isPromise } from '../../../src/utils/common-util'
 
 export default {
   components: {
@@ -493,6 +505,13 @@ export default {
     if (gridParams.lineEdit !== null && gridParams.lineEdit !== undefined) {
       lineEdit = gridParams.lineEdit
     }
+    let textOverflow = 'hidden'
+    if (gridParams.basicInfo && gridParams.basicInfo.textOverflow) {
+      textOverflow = gridParams.basicInfo.textOverflow
+    }
+    if (this.isShowForm) {
+      textOverflow = 'newline'
+    }
     return {
       selectRow: null,
       that: this,
@@ -524,7 +543,8 @@ export default {
       rowLinkConfigMapping: {},
       requiredClass: '',
       lineEdit,
-      options
+      options,
+      textOverflow
     }
   },
   computed: {
@@ -556,7 +576,7 @@ export default {
             return true
           }
         }
-        return this.row.$editing;
+        return this.row.$editing
       } catch (error) {
         return false
       }
@@ -585,7 +605,7 @@ export default {
     'row.$editing': {
       deep: true,
       handler(newValue) {
-        if([false].includes(newValue)) {
+        if ([false].includes(newValue)) {
           this.clearAllEditing()
         }
       }
@@ -779,8 +799,14 @@ export default {
       }
     },
     // 手动编辑触发
-    onEditing(event) {
+    async onEditing(event) {
       if (this.hasEditPermission && !this.isEditing) {
+        let canEdit = true
+        // 触发编辑前事件
+        if (isEditOptionFunction('beforeEdit', this.listCode)) {
+          canEdit = await this.triggerCustomEvent('beforeEdit')
+        }
+        if (!canEdit) return
         event.stopPropagation()
 
         const onEditing = () => {
@@ -792,13 +818,13 @@ export default {
           setTimeout(this.focusBottomInput, 400)
         }
 
-        if(!this.isFormSubTable) {
+        if (!this.isFormSubTable) {
           // 非子表
           if (storeVuex.getters.isConfigEditing) {
             if (storeVuex.getters.isRowEditing(this.$rowGuId)) {
               onEditing()
             } else {
-              const isNext =  this.isLastEditRowSaveMessage(this.listCode)
+              const isNext = this.isLastEditRowSaveMessage(this.listCode)
               if (!isNext) return
             }
             // else {
@@ -806,7 +832,7 @@ export default {
             //   // this.confirmBeforeSwitchingRow(this.listCode, () => { })
             // }
           } else {
-            const isNext =  this.isLastEditRowSaveMessage(this.listCode)
+            const isNext = this.isLastEditRowSaveMessage(this.listCode)
             if (!isNext) return
             // 如果不是子表 则 开启 编辑模式
             this.editRow(this.rowIndex, this.listCode, true)
@@ -825,26 +851,27 @@ export default {
       this.$nextTick(() => {
         try {
           const getOffsetParent = (selectorAll) => {
-            return selectorAll ? Array.from(this.$refs.dynamicRef.$el.querySelectorAll(selectorAll)).filter(control => !!control.offsetParent) : [];
+            return selectorAll
+              ? Array.from(this.$refs.dynamicRef.$el.querySelectorAll(selectorAll)).filter(
+                  (control) => !!control.offsetParent
+                )
+              : []
           }
 
-          let visibleFormControls = getOffsetParent('.el-select, .el-date-picker, .el-upload');
+          let visibleFormControls = getOffsetParent('.el-select, .el-date-picker, .el-upload')
           if (visibleFormControls.length) {
             visibleFormControls[0].click()
           } else {
-            visibleFormControls = getOffsetParent('input, textarea');
+            visibleFormControls = getOffsetParent('input, textarea')
             if (visibleFormControls.length > 0) {
               const bottomControl = visibleFormControls.reduce((prev, current) => {
-                return current.getBoundingClientRect().bottom > prev.getBoundingClientRect().bottom
-                  ? current
-                  : prev;
-              });
+                return current.getBoundingClientRect().bottom > prev.getBoundingClientRect().bottom ? current : prev
+              })
               if (['INPUT', 'TEXTAREA'].includes(bottomControl.tagName)) {
-                bottomControl.focus();
-                bottomControl.select();
+                bottomControl.focus()
+                bottomControl.select()
               }
             }
-
           }
         } catch (error) {
           console.error(error)
@@ -1115,7 +1142,14 @@ export default {
       }
     },
     isRequired(editing) {
-      if (!this.isFormSubTable && this.lineEdit && this.lineEdit.editable && this.isEditable && editing && this.column.validations) {
+      if (
+        !this.isFormSubTable &&
+        this.lineEdit &&
+        this.lineEdit.editable &&
+        this.isEditable &&
+        editing &&
+        this.column.validations
+      ) {
         if (this.column.validations.indexOf('"required":true') > 0) {
           return true
         }
@@ -1170,11 +1204,47 @@ export default {
       }
     },
     changeRequired(required) {
-      this.requiredClass = required? 'm-requried' : ''
+      this.requiredClass = required ? 'm-requried' : ''
     },
     openPageEvent(openPageParams) {
       console.log('normalColumnContent----openPageEvent----', openPageParams)
       this.$emit('open-page', openPageParams)
+    },
+    triggerCustomEvent(type) {
+      return new Promise((resolve) => {
+        const gridParams = store.get(this.listCode)
+        const isSubTableShowPage = gridParams.isSubTableShowPage
+        // 每页显示多少条
+        const pageSize = gridParams.pagination && gridParams.pagination.pageSize
+        let canEdit = gridParams.options.lineEditOptions[type].call(this, {
+          gridData: isSubTableShowPage ? gridParams.subTableData : gridParams.gridData,
+          listCode: this.listCode,
+          entity: gridParams.gridData[this.rowIndex],
+          row: gridParams.gridData[this.rowIndex],
+          rowIndex: this.rowIndex,
+          columns: gridParams.columns,
+          isMobile: false,
+          pageGridData: isSubTableShowPage ? gridParams.gridData : null,
+          pageSize,
+          additionalParamMap: getAdditionalParamMap(gridParams),
+          pageContext: gridParams.pageContext,
+          configureObj: gridParams.configureObj
+        })
+        if (isPromise(canEdit)) {
+          canEdit.then((result) => {
+            if (result === undefined || result === true) {
+              resolve(true)
+            } else {
+              resolve(false)
+            }
+          })
+        } else {
+          if (canEdit === undefined || canEdit === true) {
+            resolve(true)
+          }
+          resolve(false)
+        }
+      })
     }
   },
   emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']