agilebuilder-ui 1.0.70 → 1.0.71-tmp2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.70",
+  "version": "1.0.71tmp2",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",
@@ -19,7 +19,8 @@
     "path-to-regexp": "6.2.1",
     "sortablejs": "^1.15.0",
     "tinymce": "5.8.2",
-    "uuid": "^9.0.1"
+    "uuid": "^9.0.1",
+    "vue-plugin-load-script": "^1.3.2"
   },
   "devDependencies": {
     "@element-plus/icons-vue": "^2.1.0",

package/packages/department-tree/src/department-tree.vue

@@ -1,16 +1,28 @@
 <template>
 	<div>
+		
+		<DepartmentMobileTree
+			v-if="isMobile"
+			ref="inlineDeparmentTree"
+			:department-info="departmentInfo"
+			:multiple="multiple"
+			:search-field="searchField"
+			:select-department-info="selectDepartmentInfo"
+			:separator="separator"
+			@close="result"
+		/>
 		<el-dialog
-				:close-on-click-modal="false"
-				:title="myTitle"
-				:width="multiple ? '920px' : '509px'"
-				append-to-body
-				class="user-tree"
-				model-value
-				@close="$emit('close')"
-				@closed="$emit('closed')"
-				@open="$emit('open')"
-				@opend="$emit('opend')"
+			v-else
+			:close-on-click-modal="false"
+			:title="myTitle"
+			:width="multiple ? '920px' : '509px'"
+			append-to-body
+			class="user-tree"
+			model-value
+			@close="$emit('close')"
+			@closed="$emit('closed')"
+			@open="$emit('open')"
+			@opend="$emit('opend')"
 		>
 			<inline-department-tree
 					ref="inlineDeparmentTree"
@@ -40,11 +52,14 @@
 <script>
 import {$emit} from '../../utils/gogocodeTransfer'
 import InlineDepartmentTree from '../../department-tree-inline/src/department-tree-inline.vue'
+import DepartmentMobileTree from '../../department-tree-mobile/src/department-tree-app.vue'
+import {isMobileBrowser} from '../../../src/utils/common-util'
 
 export default {
 	name: 'DepartmentTree',
 	components: {
 		InlineDepartmentTree,
+		DepartmentMobileTree
 	},
 	props: {
 		// 是否是多选树，默认是true
@@ -93,12 +108,15 @@ export default {
 		},
 	},
 	data() {
+    	const isMobile = isMobileBrowser()
+		console.log('部门树---isMobile=', isMobile)
 		let myTitle = this.$t('imatrixUIMessage.pleaseSelectDepartment')
 		if (this.title) {
 			myTitle = this.title
 		}
 		return {
 			myTitle,
+			isMobile
 		}
 	},
 	methods: {

package/packages/department-tree-mobile/src/department-tree-app.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="isShowForm" direction="btt" size="100%" class="organization-tree">
+    <el-drawer v-model="isShowForm" :close-on-click-modal="false" :close-on-press-escape="false" direction="btt" size="100%" class="organization-tree" @close="closeTree()">
     <template #header>
         <div style="text-align: center;">
             {{$t('imatrixUIMessage.pleaseSelect')}}
@@ -48,10 +48,10 @@ const props = defineProps<{
 		}
 	}>()
 	const emits = defineEmits(['close'])
-	let isShowForm = ref(false)
-	function showTree() {
-		isShowForm.value = true
-	}
+	let isShowForm = ref(true)
+	// function showTree() {
+	// 	isShowForm.value = true
+	// }
 	function closeTree(selectNodeInfo) {
 		emits('close', selectNodeInfo)
 		isShowForm.value = false
@@ -59,7 +59,7 @@ const props = defineProps<{
 	function selectDepartment() {
 		// this.$refs.inlineDeparmentTree.selectDepartment()
 	}
-	defineExpose({showTree})
+	// defineExpose({showTree})
 </script>
 <style>
 .organization-tree, .organization-tree .el-checkbox__label,.organization-tree .el-breadcrumb__inner,.organization-tree .el-tree {

package/packages/department-user-tree/src/department-user-tree.vue

@@ -1,7 +1,7 @@
 <template>
 	<div>
 		<department-user-multi-tree
-				v-if="multiple"
+				v-if="!isMobile && multiple"
 				:department-info="departmentInfo"
 				:height="height"
 				:is-need-virtual-user="isNeedVirtualUser"
@@ -16,7 +16,7 @@
 				@opendDialog="opendDialog"
 		/>
 		<department-user-single-tree
-				v-if="!multiple"
+				v-if="!isMobile && !multiple"
 				:department-info="departmentInfo"
 				:is-need-virtual-user="isNeedVirtualUser"
 				:title="title"
@@ -26,6 +26,14 @@
 				@openDialog="openDialog"
 				@opendDialog="opendDialog"
 		/>
+		<DepartmentUserMobileTree
+			v-if="isMobile"
+			:department-info="departmentInfo"
+			:search-field="searchField"
+			:select-user-info="selectUserInfo"
+			:separator="separator"
+			@close="closeDialog"
+		/>
 	</div>
 </template>
 
@@ -33,12 +41,15 @@
 import {$emit} from '../../utils/gogocodeTransfer'
 import DepartmentUserSingleTree from './department-user-single-tree.vue'
 import DepartmentUserMultiTree from './department-user-multiple-tree.vue'
+import DepartmentUserMobileTree from '../../department-user-tree-mobile/src/department-user-tree-app.vue'
+import {isMobileBrowser} from '../../../src/utils/common-util'
 
 export default {
 	name: 'DepartmentUserTree',
 	components: {
 		DepartmentUserSingleTree,
 		DepartmentUserMultiTree,
+		DepartmentUserMobileTree
 	},
 	props: {
 		// 是否是多选树，默认是true
@@ -88,12 +99,15 @@ export default {
 		}
 	},
 	data() {
+    	const isMobile = isMobileBrowser()
+		console.log('部门人员树---isMobile=', isMobile)
 		let myTitle = this.$t('imatrixUIMessage.pleaseSelectPersonnel')
 		if (this.title) {
 			myTitle = this.title
 		}
 		return {
 			myTitle,
+			isMobile
 		}
 	},
 	methods: {

package/packages/department-user-tree-mobile/src/department-user-tree-app.vue

@@ -1,5 +1,5 @@
 <template>
-    <el-drawer v-model="isShowForm" direction="btt" size="100%" class="organization-tree">
+    <el-drawer v-model="isShowForm" direction="btt" size="100%" class="organization-tree" @close="closeTree()">
     <template #header>
         <div style="text-align: center;">
             {{$t('imatrixUIMessage.pleaseSelect')}}
@@ -47,10 +47,10 @@ const props = defineProps<{
 		}
 	}>()
 	const emits = defineEmits(['close'])
-	let isShowForm = ref(false)
-	function showTree() {
-		isShowForm.value = true
-	}
+	let isShowForm = ref(true)
+	// function showTree() {
+	// 	isShowForm.value = true
+	// }
 	function closeTree(selectNodeInfo) {
 		emits('close', selectNodeInfo)
 		isShowForm.value = false
@@ -58,7 +58,7 @@ const props = defineProps<{
 	function selectDepartment() {
 		// this.$refs.inlineDeparmentTree.selectDepartment()
 	}
-	defineExpose({showTree})
+	// defineExpose({showTree})
 </script>
 <style>
 .organization-tree, .organization-tree .el-checkbox__label,.organization-tree .el-breadcrumb__inner,.organization-tree .el-tree {

package/packages/fs-upload-new/src/fs-button-upload.vue

@@ -7,7 +7,7 @@
     :show-file-list="false"
     auto-upload
     :headers="headers"
-				:disabled="!openFsUpload"
+    :disabled="!openFsUpload"
     :action="defaultAction"
     :multiple="multiple"
     :before-upload="handleBeforeUpload"
@@ -16,11 +16,11 @@
   >
     <el-button size="small" type="primary">{{ placeholder }}</el-button>
     <template #tip>
-      <el-text size="small"> {{ accept }} 上传的文件不超过{{ limitFileSize }}M</el-text>
+      <el-text size="small"> {{ accept }} {{$t('imatrixUIMessage.uploadFileTip',{fileSzie: limitFileSize})}}</el-text>
     </template>
   </el-upload>
   <template v-if="fileList && fileList.length > 0">
-    <fs-preview-new :disabled="disabled" :file-list="fileList" :system-code="systemCode" />
+    <fs-preview-new :disabled="disabled" :file-list="fileList" :system-code="systemCode" :before-remove="beforeRemove" :on-remove="onRemove" :before-download="beforeDownload"/>
   </template>
 </template>
 
@@ -31,10 +31,10 @@ import { getToken } from '../../../src/utils/auth'
 import type { UploadFile, UploadFiles } from 'element-plus'
 import fsPreviewNew from './fs-preview-new.vue'
 const props = defineProps({
-		openFsUpload:{
-				type: Boolean,
-				default: true
-		},
+  openFsUpload: {
+    type: Boolean,
+    default: true
+  },
   systemCode: {
     type: String,
     default: ''
@@ -75,10 +75,6 @@ const props = defineProps({
     type: Array<{ showName: string; serverPath: string }>,
     default: () => []
   },
-  handleBeforeUpload: {
-    type: Function,
-    default: () => {}
-  },
   onSuccess: {
     type: Function,
     default: () => {}
@@ -126,7 +122,7 @@ if (!props.headers || !props.headers['Authorization']) {
   props.headers.Authorization = getToken()
 }
 const handleBeforeUpload = (file: File) => {
-  return props.handleBeforeUpload(file)
+  return props.beforeUpload(file)
 }
 const onSuccess = (response: any, uploadFile: UploadFile, uploadFiles: UploadFiles) => {
   // eslint-disable-next-line vue/no-mutating-props

package/packages/fs-upload-new/src/fs-drag-upload.vue

@@ -18,11 +18,11 @@
     <el-icon class="el-icon--upload"><upload-filled /></el-icon>
     <div class="el-upload__text">{{ placeholder }}</div>
     <template #tip>
-      <el-text size="small"> {{ accept }} 上传的文件不超过{{ limitFileSize }}M</el-text>
+      <el-text size="small"> {{ accept }} {{$t('imatrixUIMessage.uploadFileTip',{fileSzie: limitFileSize})}}</el-text>
     </template>
   </el-upload>
   <template v-if="fileList && fileList.length > 0">
-    <fs-preview-new :disabled="disabled" :file-list="fileList" :system-code="systemCode" />
+    <fs-preview-new :disabled="disabled" :file-list="fileList" :system-code="systemCode"  :before-remove="beforeRemove" :on-remove="onRemove" :before-download="beforeDownload" />
   </template>
 </template>
 

package/packages/fs-upload-new/src/fs-preview-new.vue

@@ -1,32 +1,60 @@
 <template>
-  <div v-for="(file, index) in fileList" :key="index" style="width: 100%">
-    <el-tag>
-      <el-tooltip content="预览" placement="top">
-        <span style="cursor: pointer" @click="preview(file.showName, file.serverPath)">
-          <el-icon><Paperclip /></el-icon>
-          <span style="margin-left: 6.5px">{{ file.showName }}</span>
-        </span>
-      </el-tooltip>
-      <el-tooltip v-if="!disabled" content="下载" placement="top">
-        <el-icon  @click="handleDownload(file)">
-          <Download />
-        </el-icon>
-      </el-tooltip>
-      <el-tooltip v-if="!disabled" content="移除" placement="top">
-        <el-icon @click="handleOnRemove(file)"><Close /></el-icon>
-      </el-tooltip>
-    </el-tag>
-    <el-dialog v-model="dialogVisible" title="预览" width="500">
-      <el-image :preview-src-list="previewSrcList" :src="previewImageInfo.src" />
-    </el-dialog>
+<div>
+  <div v-if="!isMobile">
+    <div v-for="(file, index) in fileList" :key="index" style="width: 100%">
+        <el-tag>
+          <el-tooltip content="预览" placement="top">
+            <span style="cursor: pointer" @click="preview(file.showName, file.serverPath)">
+              <el-icon><Paperclip /></el-icon>
+              <span style="margin-left: 6.5px">{{ file.showName }}</span>
+            </span>
+          </el-tooltip>
+          <el-tooltip v-if="!disabled" content="下载" placement="top">
+            <el-icon  @click="handleDownload(file)">
+              <Download />
+            </el-icon>
+          </el-tooltip>
+          <el-tooltip v-if="!disabled" content="移除" placement="top">
+            <el-icon @click="handleOnRemove(file)"><Close /></el-icon>
+          </el-tooltip>
+        </el-tag>
+      </div>
   </div>
+  <span v-else class="el-upload-list__item-actions">
+    <span
+      v-if="isPreview(file.showName)"
+      class="el-upload-list__item-preview"
+      @click="preview(file.showName, file.serverPath)"
+    >
+      <el-icon><zoom-in /></el-icon>
+    </span>
+    <span
+      v-if="!disabled"
+      class="el-upload-list__item-delete"
+      @click="handleDownload(file)"
+    >
+      <el-icon><Download /></el-icon>
+    </span>
+    <span
+      v-if="!disabled"
+      class="el-upload-list__item-delete"
+      @click="handleRemove(file)"
+    >
+      <el-icon><Delete /></el-icon>
+    </span>
+  </span>
+  <el-dialog v-model="dialogVisible" title="预览" width="500">
+    <el-image :preview-src-list="previewSrcList" :src="previewImageInfo.src" />
+  </el-dialog>
+</div>
 </template>
 
 <script setup lang="ts">
 import { Close, Paperclip, Download } from '@element-plus/icons-vue'
 import { ref, defineProps } from 'vue'
-import { getSystemFrontendUrl, isPlateSys } from '../../../src/utils/common-util'
+import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getReplaceUrlDomain } from '../../../src/utils/common-util'
 import { getToken } from '../../../src/utils/auth'
+import { isImage } from '../../../src/utils/util'
 const props = defineProps({
   systemCode: {
     type: String,
@@ -59,15 +87,23 @@ const props = defineProps({
   beforeDownload: {
     type: Function,
     default: () => {}
+  },
+  file: {
+    type: Object,
+    default: null
+  },
+  baseURL: {
+    type: String,
+    default: null
   }
 })
-const baseURL = window.$vueApp.config.globalProperties.baseURL
+const baseURL = props.baseURL ? props.baseURL: window.$vueApp.config.globalProperties.baseURL
 const baseAPI = window.$vueApp.config.globalProperties.baseAPI
 
 const dialogVisible = ref<boolean>(false)
 const previewImageInfo = ref<any>({})
 const previewSrcList = ref<string[]>([])
-
+const isMobile = ref(isMobileBrowser())
 const handleDownload = (file: any) => {
   if (isPromise(props.beforeDownload)) {
     props.beforeDownload(props.pageContext, props.configure, file).then((res: any) => {
@@ -122,11 +158,11 @@ const isPromise = (p: any) => {
 const preview = (showName: string, serverPath: string) => {
   console.log('preview')
 
-  let isImage = false
-  if (showName && /\.(jpg|JPG|jpeg|JPEG|png|PNG|gif|GIF|bmp|BMP|psd|PSD|tif|TIF)$/.test(showName)) {
-    isImage = true
+  let isImg = false
+  if (showName && isImage(showName)) {
+    isImg = true
   }
-  if (isImage) {
+  if (isImg) {
     previewImageInfo.value.src = getPreviewSrc(showName, serverPath)
     const srcList: string[] = []
     props.fileList.forEach((item: any) => {
@@ -135,6 +171,7 @@ const preview = (showName: string, serverPath: string) => {
     previewSrcList.value = srcList
     dialogVisible.value = true
   } else {
+    // 移动端时不能预览文档
     previweDoc(showName, serverPath)
   }
 }
@@ -187,6 +224,7 @@ function getPreviewSrc(showName: string, serverPath: string) {
   if (!isPlateSys(props.systemCode)) {
     url = baseAPI + '/component/super-form/downloads?jwt=' + token
   }
+  url = getReplaceUrlDomain(url)
   return url + '&showName=' + encodeURI(showName) + '&serverPath=' + serverPath
 }
 
@@ -196,4 +234,16 @@ const formatName = (showName: string) => {
   }
   return showName
 }
+
+const isPreview = (fileName: string) => {
+  if(isMobile.value){
+    if (fileName && isImage(fileName)) {
+      // 移动端时，只能预览图片
+      return true
+    }
+  } else {
+    return true
+  }
+  return false
+}
 </script>

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(
@@ -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,{
@@ -1134,7 +1134,7 @@ const apis = {
             // 每页显示多少条
             const pageSize =
               gridParams.pagination && gridParams.pagination.pageSize
-            const isMobile = false
+            const isMobile = this.isMobile
             if(gridParams.pageContext){
               gridParams.options.lineEditOptions.afterDelete.call(
                 this,{

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

@@ -1,25 +1,26 @@
 <template>
-	<div class="search-button" style="text-align: right">
+	<div class="search-button" :style="{textAlign: isMobile?'center':'right'}">
 		<!-- :loading="loading" -->
-		<el-button class="button--default" size="default" @click="$emit('save-condition')">
-			{{ $t('superGrid.saveCondition') }}
-		</el-button>
-		<el-button :loading="loading" class="button--default" size="default" @click="resetForm">
-			{{ $t('imatrixUIPublicModel.reset') }}
-		</el-button>
 		<el-button
 				:loading="loading"
 				size="default"
 				type="primary"
 				@click="submitForm"
 		>
-			{{ $t('imatrixUIMessage.search') }}
+			{{$t('imatrixUIPublicModel.sure')}}
+		</el-button>
+		<el-button :loading="loading" class="button--default" size="default" @click="resetForm">
+			{{ $t('imatrixUIPublicModel.reset') }}
+		</el-button>
+		<el-button class="button--default" size="default" @click="$emit('save-condition')">
+			{{ $t('superGrid.saveCondition') }}
 		</el-button>
 		<el-button
-				:icon="isMyOpen ? CaretTop : CaretBottom"
-				link
-				size="default"
-				@click="openFold"
+			v-if="!isMobile"
+			:icon="isMyOpen ? CaretTop : CaretBottom"
+			link
+			size="default"
+			@click="openFold"
 		>
 			{{ isMyOpen ? $t('superGrid.fold') : $t('superGrid.open') }}
 		</el-button>
@@ -38,6 +39,7 @@
 import {$emit} from '../../utils/gogocodeTransfer'
 import {CaretBottom, CaretTop} from '@element-plus/icons-vue'
 import {shallowRef} from "vue";
+import {isMobileBrowser} from '../../../src/utils/common-util'
 
 export default {
 	name: 'SearchButton',
@@ -45,15 +47,17 @@ export default {
 		isOpen: {
 			type: Boolean,
 			default: false,
-		},
+		}
 	},
 	data() {
+		const isMobile = isMobileBrowser()
 		const isMyOpen = this.isOpen
 		return {
 			isMyOpen, // false表示折叠状态，应该显示“展开”,true表示当前是展开状态，应该显示“折叠”
 			loading: false,
 			CaretTop: shallowRef(CaretTop),
-			CaretBottom: shallowRef(CaretBottom)
+			CaretBottom: shallowRef(CaretBottom),
+			isMobile // 移动端时不需要显示展开折叠按钮
 		}
 	},
 	methods: {