agilebuilder-ui 1.0.621 → 1.0.962

package/packages/plugins/export-data-new.js

@@ -338,11 +338,32 @@ function exportListData(
             exportOptions.pageContext.canClick = true
           }
           if (isAsync) {
+            const message = getI18n().t('imatrixUIMessage.asyncExport')
+          const exportPageUrl = getDcExportPageUrl()
+          let vnode
+          if (exportPageUrl) {
+            vnode = '<p><span>' + message + '</span>'
+            // 请点击进行权限申请
+            const asyncExportJumpMsg = getI18n().t('imatrixUIMessage.asyncExportJumpMsg')
+            vnode += '<a href="#" style="color: #1800ff;font-weight: bold;text-decoration:underline" onclick="window.open(\'' + exportPageUrl + '\')">' + asyncExportJumpMsg + '</a>'
+            vnode += '</p>'
+          }
+          if (vnode) {
             Message({
-              message: getI18n().t('imatrixUIMessage.asyncExport'),
+              showClose: true,
+              dangerouslyUseHTMLString: true,
+              message: vnode,
               type: 'success',
+              duration: 10 * 1000
+            })
+          } else {
+            Message({
               showClose: true,
+              message: message,
+              type: 'success',
+              duration: 5 * 1000
             })
+          }
             localStorage.setItem(uuid, 'ok')
           } else {
             if (data.indexOf('~~') >= 0) {
@@ -375,6 +396,18 @@ function exportListData(
     }
   })
 }
+// 获得文件中心/导出任务菜单的路由地址
+function getDcExportPageUrl() {
+  let exportPageUrl
+  const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+  if (baseAPI) {
+    // 获得平台的域名和端口
+    const baseUrls = baseAPI.split('/')
+    const baseUrlPrefix = baseUrls[0] + '//' + baseUrls[2]
+    exportPageUrl = baseUrlPrefix + '/document-center/#/file-task/file-export-task/list'
+  }
+  return exportPageUrl
+}
 /**
  * 根据uuid获取导出情况
  * @param {*} uuid

package/packages/rich-editor/index.vue

@@ -40,6 +40,19 @@
 		>
 			<div :id="fullscreenViewerId"/>
 		</el-dialog>
+		<!--<el-image-->
+			<!--  ref="preview"-->
+			<!--  :src="imgList[0]"-->
+			<!--  :preview-src-list="imgList"-->
+			<!--  style="display: none"-->
+		<!--/>-->
+		<el-image-viewer
+			v-if="isLightBoxVisible"
+			hide-on-click-modal
+			:initial-index="0"
+			:url-list="imgList"
+			:on-close="() =>{isLightBoxVisible = false}"
+		/>
 	</div>
 </template>
 
@@ -92,11 +105,13 @@ import 'tinymce/plugins/visualchars' //
 import 'tinymce/plugins/wordcount' // 数字统计
 import 'tinymce/skins/ui/oxide/skin.css' // 编辑器皮肤样式
 import './tinymce/zh_CN.js'
+import {ElImageViewer} from 'element-plus'
 
 export default {
 	name: 'RichEditor',
 	components: {
 		Editor,
+		ElImageViewer
 	},
 	props: {
 		entity: {
@@ -188,6 +203,18 @@ export default {
 					}
 					return url
 				},
+				setup: (editor) => {
+					editor.on('click', (e) => {
+						const targetNode = e.target.nodeName
+						if (targetNode === 'IMG') {
+						// 这里可以实现自定义的图片预览逻辑
+						const imgSrc = e.target.src
+						this.imgList = []
+						this.imgList.push(imgSrc)
+						this.isLightBoxVisible = true
+						}
+					})
+				},
 				images_upload_handler: (blobInfo, success, failure, progress) => {
 					let file
 					if (blobInfo.blob() instanceof File) {
@@ -223,6 +250,8 @@ export default {
 			dialogVisible: false,
 			fullscreenViewerId: 'editor_viewer_' + new Date().getTime(),
 			ImageComponent: null,
+			imgList: [],
+			isLightBoxVisible: false
 		}
 	},
 	watch: {

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/scan-code-input/src/scan-code-input.vue

@@ -13,120 +13,152 @@
       @input="input"
       @clear="clear"
     >
-      <template v-slot:append>
-        <el-button
-          v-if="isMobile"
-          :icon="ElIconFullScreen"
-          @click="openVideo"
-        />
+      <template v-if="isShowScanIcon" v-slot:append>
+        <SuperIcon iconValue="fa-barcode" @click="scanClick()"></SuperIcon>
       </template>
       <!-- <el-button slot="append" icon="el-icon-full-screen" @click="openVideo" /> -->
     </el-input>
-    <scan-code-input-colse
-      v-if="isShow"
-      :colse-video="colseVideo"
-      @close="closeVideo"
-    />
+    <scan-code-input-browser v-if="isShow" :colse-video="colseVideo" @close="closeBrowserScan" />
   </div>
 </template>
 
 <script type="text/ecmascript-6">
-import { FullScreen as ElIconFullScreen } from '@element-plus/icons-vue'
-import { $on, $off, $once, $emit } from '../../utils/gogocodeTransfer';
-import scanCodeInputColse from './scan-code-input-colse.vue'
+import { $on, $off, $once, $emit } from '../../utils/gogocodeTransfer'
+import scanCodeInputBrowser from '../../scan-code-input-browser/src/scan-code-input.vue'
 import events from './events'
+import { isMobileBrowser } from '../../../src/utils/common-util'
 export default {
-    data() {
-
-      return {
-          isMobile: false,
-isShow: false,
-scanCode: '',
-          ElIconFullScreen,
+  data() {
+    const isMobile = isMobileBrowser()
+    let userAgent
+    const userAgentOrg = navigator.userAgent
+    if (userAgentOrg.indexOf(' uni-app ') > 0) {
+      // 表示uni-app中访问的
+      userAgent = 'app'
+    } else {
+      // 表示手机浏览器访问的
+      userAgent = 'browser'
+    }
+    console.log('scanCodeInputBrowser----window.location.protocol---', window.location.protocol)
+    const isShowScanIcon = isMobile && window.location.protocol === 'https:' ? true: false
+    const isApk = isMobile && userAgent && userAgent === 'app' ? true: false
+    return {
+      isMobile,
+      isShow: false,
+      scanCode: '',
+      isShowScanIcon,
+      isApk
+    }
+  },
+  name: 'ScanCodeInput',
+  components: {
+    scanCodeInputBrowser
+  },
+  model: {
+    prop: 'value',
+    event: 'input'
+  },
+  props: {
+    colseVideo: {
+      type: Boolean,
+      default: false
+    },
+    value: {
+      type: String,
+      default: null
+    },
+    disable: {
+      type: Boolean,
+      default: false
+    },
+    placeholder: {
+      type: String,
+      default: null
+    },
+    clearable: {
+      type: Boolean,
+      default: null
+    },
+    readonly: {
+      type: Boolean,
+      default: false
+    },
+    maxlength: {
+      type: Number,
+      default: null
+    },
+    // 组件id，页面内要唯一
+    componentId: {
+      type: String,
+      default: null
+    },
+    // 列表中使用该组件，需要传该参数
+    listCode: {
+      type: String,
+      default: null
+    }
+  },
+  watch: {
+    value: {
+      deep: true,
+      handler(val) {
+        this.scanCode = this.value
+      }
+    }
+  },
+  created() {
+    // this.tipShow = true
+    this.scanCode = this.value
+  },
+  beforeUnmount() {},
+  methods: {
+    ...events,
+    // equipment() {
+    //   const flag = navigator.userAgent.match(
+    //     /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i
+    //   )
+    //   if (flag) {
+    //     return flag
+    //   } else {
+    //     try {
+    //       document.createEvent('TouchEvent')
+    //       return true
+    //     } catch (e) {
+    //       return false
+    //     }
+    //   }
+    // },
+    openVideo() {
+      if (this.isShow) {
+        this.isShow = false
+      } else {
+        this.isShow = true
       }
     },
-    name: 'ScanCodeInput',
-components: {
-scanCodeInputColse
-},
-model: {
-prop: 'value',
-event: 'input'
-},
-props: {
-colseVideo: {
-type: Boolean,
-default: false
-},
-value: {
-type: String,
-default: null
-},
-disable: {
-type: Boolean,
-default: false
-},
-placeholder: {
-type: String,
-default: null
-},
-clearable: {
-type: Boolean,
-default: null
-},
-readonly: {
-type: Boolean,
-default: false
-},
-maxlength: {
-type: Number,
-default: null
-}
-},
-watch: {
-value: {
-deep: true,
-handler(val) {
-  this.scanCode = this.value
-}
-}
-},
-created() {
-// this.tipShow = true
-this.isMobile = this.equipment()
-this.scanCode = this.value
-},
-beforeUnmount() {
-
-},
-methods: {
-...events,
-equipment() {
-const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
-if (flag) {
-  return flag
-} else {
-  try {
-    document.createEvent('TouchEvent')
-    return true
-  } catch (e) {
-    return false
-  }
-}
-},
-openVideo() {
-if (this.isShow) {
-  this.isShow = false
-} else {
-  this.isShow = true
-}
-},
-closeVideo(value) {
-this.isShow = false
-this.value = value
-$emit(this, "colse",value)
-}
-},
-emits:['colse','update:value',]
+    closeBrowserScan(value) {
+      this.isShow = false
+      this.value = value
+      $emit(this, 'colse', value)
+    },
+    scanClick(){
+      if(!this.isApk){
+        // 表示是移动端浏览器
+        this.openVideo()
+      } else {
+        // 表示是移动端apk
+        this.scanClickApk()
+      }
+    },
+    scanClickApk() {
+      // 表示是APK中
+      const message = {
+        type: 'scan',
+        componentId: this.componentId,
+        listCode: this.listCode
+      }
+      window.parent.postMessage(JSON.stringify(message), '*')
+    }
+  },
+  emits: ['colse', 'update:value']
 }
 </script>

package/packages/scan-code-input-browser/index.js

@@ -0,0 +1,6 @@
+import ScanCodeInputBrowser from './src/scan-code-input.vue'
+ScanCodeInputBrowser.install = function (Vue) {
+  Vue.component(ScanCodeInputBrowser.name, ScanCodeInputBrowser)
+}
+
+export default ScanCodeInputBrowser

package/packages/{scan-code-input/src/scan-code-input-colse.vue → scan-code-input-browser/src/scan-code-input.vue}

@@ -18,7 +18,7 @@
 import { $on, $off, $once, $emit } from '../../utils/gogocodeTransfer';
 import { BrowserMultiFormatReader } from '@zxing/library'
 
-export default {name: 'ScanCodeInputColse',
+export default {name: 'ScanCodeInputBrowser',
 components: {},
 props: {
   colseVideo: {
@@ -69,33 +69,6 @@ methods: {
       console.error(err)
     })
   },
-  async openScanTwo() {
-    const that = this
-    // codeReader.reset() // 重置
-    // that.textContent = null // 重置
-    that.codeReader = await new BrowserMultiFormatReader()
-    that.codeReader.listVideoInputDevices().then((videoInputDevices) => {
-      that.tipShow = true
-      that.tipMsg = this.$t('messageVideo.callingRearCamera')
-      console.log('videoInputDevices', videoInputDevices)
-      // 默认获取第一个摄像头设备id
-      let firstDeviceId = videoInputDevices[0].deviceId
-      // 获取第一个摄像头设备的名称
-      const videoInputDeviceslablestr = JSON.stringify(videoInputDevices[0].label)
-      if (videoInputDevices.length > 1) {
-        // 判断是否后置摄像头
-        if (videoInputDeviceslablestr.indexOf('back') > -1) {
-          firstDeviceId = videoInputDevices[0].deviceId
-        } else {
-          firstDeviceId = videoInputDevices[1].deviceId
-        }
-      }
-      that.decodeFromInputVideoFunc(firstDeviceId)
-    }).catch((err) => {
-      that.tipShow = false
-      console.error(err)
-    })
-  },
   decodeFromInputVideoFunc(firstDeviceId) {
     const that = this
     that.codeReader.reset() // 重置

package/packages/secret-info/index.vue

@@ -31,7 +31,7 @@ export default {
       default: null,
     },
     value: {
-      type: String,
+      type: [String, Number],
       default: null,
     },
     tableName: {
@@ -79,7 +79,7 @@ export default {
         pageCode: this.pageCode,
         fieldName: this.prop,
         fieldCnName: this.fieldLabel,
-        ciphertext: this.value,
+        ciphertext: this.value ? this.value + '' : null
       }
       if (this.entity) {
         params.dataId = this.entity.ID ? this.entity.ID : this.entity.id