agilebuilder-ui 1.0.84 → 1.0.85-temp2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.84",
+  "version": "1.0.85-temp2",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/dynamic-source-select/src/dynamic-source-select.vue

@@ -233,6 +233,9 @@ export default {
 		},
 	},
 	created() {
+		if (this.options && this.options.backendUrl) {
+			this.backendUrl = this.options.backendUrl
+		}
 		if (this.options && this.options.dynamicDataSourceCode) {
 			this.dynamicDataSourceCode = this.options.dynamicDataSourceCode.trim()
 			const param = {

package/packages/fs-upload-list/src/fs-upload-list.vue

@@ -253,7 +253,8 @@ export default {
     },
     handleBeforeUpload(file) {
       let limitFileSize = this.fileSetObj.limitFileSize
-      if (limitFileSize === undefined) {
+      console.log('handleBeforeUpload-----limitFileSize=', limitFileSize)
+      if (!limitFileSize) {
         // 默认是30M
         limitFileSize = 30
       }

package/packages/index.js

@@ -39,6 +39,7 @@ import SuperIcon from './super-icon'
 import FsUploadNew from './fs-upload-new'
 import ScanCodeInputBrowser from './scan-code-input-browser'
 import WorkgroupTreeMobile from './workgroup-tree-mobile'
+import RowForm from './row-form'
 import * as ElementPlusIconsVue from "@element-plus/icons-vue"
 // 将所有组件都存储起来,方便后续统一注册
 const components = [
@@ -77,7 +78,8 @@ const components = [
 	SuperIcon,
 	FsUploadNew,
   ScanCodeInputBrowser,
-  WorkgroupTreeMobile
+  WorkgroupTreeMobile,
+  RowForm
 ]
 
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
@@ -137,7 +139,8 @@ export {
 	SuperIcon,
 	FsUploadNew,
   ScanCodeInputBrowser,
-  WorkgroupTreeMobile
+  WorkgroupTreeMobile,
+  RowForm
 }
 
 export default {

package/packages/rich-editor/index.vue

@@ -111,7 +111,7 @@ export default {
 	name: 'RichEditor',
 	components: {
 		Editor,
-		// ElImageViewer
+		ElImageViewer
 	},
 	props: {
 		entity: {

package/packages/row-form/index.js

@@ -0,0 +1,7 @@
+import RowForm from './index.vue'
+
+RowForm.install = function (Vue) {
+  Vue.component(RowForm.name, RowForm)
+}
+
+export default RowForm

package/packages/row-form/index.vue

@@ -0,0 +1,211 @@
+<template>
+  <el-drawer
+    v-model="isShowForm"
+    :close-on-click-modal="false"
+    :close-on-press-escape="false"
+    direction="btt"
+    size="100%"
+    @close="closeForm()"
+  >
+    <template #header>
+      <div style="text-align: center">
+        {{ $t('superGrid.recordLine', { row: realEditIndex + 1 }) }}
+      </div>
+    </template>
+    <template #default>
+      <el-form label-width="auto">
+        <template v-for="(column, index) in columns" >
+          <el-form-item  :key="index" v-if="column.prop != '$index' && column.prop != '$selection'  && column.prop != 'operation'" :label="getMyHeaderLable(column)" >
+            <NormalColumnContent
+            :ref="column.prop"
+            :is-sql="isSql"
+            :column="column"
+            :list-code="listCode"
+            :drag-column-prop="dragColumnProp"
+            :right-click-menu-arr="options.rightClickMenuArr"
+            :table-name="tableName"
+            :page-code="pageCode"
+            :list-toolbar-form-data="listToolbarFormData"
+            :list-name="listName"
+            :options="options"
+            :current-page="currentPage"
+            :grid-data="gridData"
+            :page-grid-data="pageGridData"
+            :row="gridData[realEditIndex]"
+            :row-index="realEditIndex"
+            :is-show-form="true"
+            @open-page="openPageEvent"
+            @refresData="refresData"
+            @refresh-list="refreshList"
+            @refresPortData="refresPortData"
+            @refresPortsData="refresPortsData"
+            @refresMainTableFields="refresMainTableFields"
+            @prohibitToEdit="prohibitToEdit"
+          />
+          </el-form-item>
+        </template>
+
+      </el-form>
+      <el-button v-if="realEditIndex !== 0" type="primary" link @click="prevRow">
+        {{ $t('superGrid.prevRow') }}
+      </el-button>
+      <el-button v-if="realEditIndex !== gridData.length - 1" type="primary" link @click="nextRow">
+        {{ $t('superGrid.nextRow') }}
+      </el-button>
+    </template>
+  </el-drawer>
+</template>
+<script lang="ts">
+export default {
+  name: 'RowForm'
+}
+</script>
+<script setup lang="ts">
+import NormalColumnContent from '../super-grid/src/normal-column-content.vue'
+import {
+  getHeaderLable
+} from '../super-grid/src/utils'
+import { reactive, ref, onMounted, defineEmits, nextTick } from 'vue'
+const props = defineProps<{
+  columns: {
+    type: Array<any>
+    default: null
+  }
+  listCode: {
+    type: String
+    default: null
+  }
+  isSql: {
+    type: Boolean
+    default: false
+  }
+  dragColumnProp: {
+    type: String
+    default: null
+  }
+  tableName: {
+    type: String
+    default: null
+  }
+  pageCode: {
+    type: String
+    default: null
+  }
+  listName: {
+    type: String
+    default: null
+  }
+  currentPage: {
+    type: Number
+    default: 1
+  }
+  gridData: {
+    type: Array<any>
+    default: null
+  }
+  pageGridData: {
+    type: Array<any>
+    default: null
+  }
+  listToolbarFormData: {
+    type: Object
+    default: null
+  }
+  // 行记录序号
+  rowIndex: {
+    type: Number
+    default: 0
+  }
+  options: {
+    type: Object
+    default: null
+  }
+  lineEdit: {
+    type: Object
+    default: null
+  }
+}>()
+const emits = defineEmits([
+  'open-page',
+  'close',
+  'prohibitToEdit',
+  'refresData',
+  'refresPortData',
+  'refresPortsData',
+  'refresMainTableFields'
+])
+const realEditIndex: any = ref(props.rowIndex)
+const isShowForm = ref(true)
+const reload = ref(true)
+function getMyHeaderLable(column) {
+  return getHeaderLable(column)
+}
+function prevRow() {
+  reload.value = false
+  --realEditIndex.value
+  nextTick(() => {
+    reload.value = true
+  })
+  console.log(realEditIndex.value)
+}
+function nextRow() {
+  reload.value = false
+  ++realEditIndex.value
+  nextTick(() => {
+    reload.value = true
+  })
+  console.log(realEditIndex.value)
+}
+function isShowColumn(column) {
+  let hidden = true
+  if (column && column) {
+    if (column.prop === '$index') {
+      hidden = false
+    } else if (column.prop === 'operation') {
+      hidden = false
+    } else if (column.prop === '$detail') {
+      hidden = false
+    } else if (!column.show) {
+      hidden = false
+    } else if (column.formatter && column.formatter.type === 'hyperlinks') {
+      hidden = false
+    }
+  }
+  return hidden
+}
+
+function closeForm() {
+  isShowForm.value = false
+  emits('close')
+}
+
+function openPageEvent(openPageParams) {
+  emits('open-page', openPageParams)
+}
+
+// 设置字段禁止编辑
+function prohibitToEdit(entity) {
+  emits('prohibitToEdit', entity)
+}
+
+function refresData(data) {
+  emits('refresData', data)
+}
+function refresPortData(port, value) {
+  if (props && props.lineEdit && props.lineEdit.editingCell) {
+    emits('refresPortData', port, value, props.lineEdit.editingCell.row)
+  } else {
+    emits('refresPortData', port, value, this.index)
+  }
+}
+function refresPortsData(map) {
+  if (props && props.lineEdit && props.lineEdit.editingCell) {
+    emits('refresPortsData', map, props.lineEdit.editingCell.row)
+  } else {
+    emits('refresPortsData', map, this.index)
+  }
+}
+function refresMainTableFields(map) {
+  emits('refresMainTableFields', map)
+}
+</script>

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>

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

@@ -16,7 +16,7 @@ const customFormatter = {
      */
     customFormatValue(row, prop, format, rowIndex) {
         // const start = new Date().getTime()
-        // console.log('---super-grid--customFormatValue--')
+        // console.log('---super-grid--customFormatValue--this.customFormat=', this.customFormat)
         if (this.customFormat) {
             let originalValue = row[prop]
             if (this.isObjectProp(prop)) {
@@ -31,6 +31,7 @@ const customFormatter = {
                 this.column,
                 rowIndex
             )
+            // console.log('---super-grid--customFormatValue--component=', component)
             if (typeof component === 'undefined') {
                 return false
             } else {

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

@@ -300,6 +300,7 @@
         dynamicDataSourceCode: dynamicDataSourceCode,
         valueSetOptions: valueSetOptions,
         isSql: isSql,
+        backendUrl: baseURL,
         additionalParameter: additionalParamMap ? JSON.stringify(additionalParamMap) : null
       }"
       :parent="parentFormData"
@@ -571,6 +572,11 @@ export default {
     console.log('superGrid----window.location.protocol---', window.location.protocol)
     const isShowScanIcon = isMobile && window.location.protocol === 'https:' ? true: false
     const isApk = isMobile && userAgent && userAgent === 'app' ? true: false
+    
+    let baseURL = gridParams.options.backendUrl
+    if (!baseURL) {
+      baseURL = window.$vueApp.config.globalProperties.baseURL
+    }
     return {
       deptManTree: false, // 是否是部门人员树
       isMultiTree: false, // 是否是多选树
@@ -631,7 +637,8 @@ export default {
       userAgent,
       isApk,
       isShowBrowserScan: false,
-      isShowScanIcon
+      isShowScanIcon,
+      baseURL
     }
   },
   computed: {},