agilebuilder-ui 1.0.76 → 1.0.77

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-input.vue

@@ -8,7 +8,7 @@
         :readonly="true"
       >
         <template v-slot:append>
-          <el-button v-if="!disabled" :icon="Upload" size="default" @click="openAnnexUpload" />
+          <el-button :icon="Upload" size="default" @click="openAnnexUpload" />
         </template>
       </el-input>
       
@@ -44,7 +44,6 @@
           :componentId="componentId"
           :componentName="componentName"
           :listCode="listCode"
-          :options="options"
           :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
           @uploadend="uploadendMobile"
           @remove="removeMobileFile"
@@ -161,10 +160,6 @@ const props = defineProps({
       return 'file-upload'
     }
   },
-  options: {
-    type: Object,
-    default: null
-  },
   // 列表编码
   listCode: {
     type: String,

package/packages/fs-upload-new/src/file-upload-mobile/file-upload.vue

@@ -25,7 +25,6 @@
       :componentId="componentId"
       :componentName="componentName"
       :listCode="listCode"
-      :options="options"
       :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
       @uploadend="uploadedFile"
       @remove="removeFile"
@@ -55,7 +54,6 @@
       :componentId="componentId"
       :componentName="componentName"
       :listCode="listCode"
-      :options="options"
       :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
       @uploadend="uploadedFile"
       @remove="removeFile"
@@ -170,10 +168,6 @@ const props = defineProps({
       return 'file-upload'
     }
   },
-  options: {
-    type: Object,
-    default: null
-  },
   // 列表编码
   listCode: {
     type: String,

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

@@ -5,8 +5,8 @@
     :row="entity"
     :disabled="disabled"
     :fileInfo="fileInfo"
-				:openFsUpload="openFsUpload"
-    :fileSetObj="{ accept: accept, multiple: multiple, limitFileSize: limitFileSize }"
+		:openFsUpload="openFsUpload"
+    :fileSetObj="{ accept: accept, multiple: multiple, limitFileSize: limitFileSize, limit: limitNum }"
     @upload-success="onInputUploadSuccess"
     @delete-success="onInputDeleteSuccess"
   />
@@ -17,7 +17,7 @@
     :systemCode="systemCode"
     :accept="accept"
     :multiple="multiple"
-    :limit="limit"
+    :limit="limitNum"
     :limitFileSize="limitFileSize"
     :placeholder="placeholder"
     :action="action"
@@ -39,7 +39,7 @@
     :systemCode="systemCode"
     :accept="accept"
     :multiple="multiple"
-    :limit="limit"
+    :limit="limitNum"
     :limitFileSize="limitFileSize"
     :placeholder="placeholder"
     :action="action"
@@ -62,7 +62,7 @@
     :systemCode="systemCode"
     :accept="accept"
     :multiple="multiple"
-    :limit="limit"
+    :limit="limitNum"
     :limitFileSize="limitFileSize"
     :placeholder="placeholder"
     :action="action"
@@ -79,7 +79,6 @@
     :componentId="componentId"
     :componentName="componentName"
     :listCode="listCode"
-    :options="options"
     :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
   />
   <FileUploadMobile v-else-if="isMobile"
@@ -89,7 +88,7 @@
     :systemCode="systemCode"
     :accept="accept"
     :multiple="multiple"
-    :limit="limit"
+    :limit="limitNum"
     :limitFileSize="limitFileSize"
     :placeholder="placeholder"
     :action="action"
@@ -106,7 +105,6 @@
     :componentId="componentId"
     :componentName="componentName"
     :listCode="listCode"
-    :options="options"
     :openCameraOrChoosePhoto="openCameraOrChoosePhoto"
     @uploadend="uploadendMobile"
     @remove="removeMobileFile"
@@ -156,7 +154,7 @@ const props = defineProps({
   },
   limit: {
     type: Number,
-    default: 1
+    default: null
   },
   limitFileSize: {
     type: Number,
@@ -220,10 +218,6 @@ const props = defineProps({
       return 'file-upload'
     }
   },
-  options: {
-    type: Object,
-    default: null
-  },
   // 列表编码
   listCode: {
     type: String,
@@ -242,6 +236,14 @@ const listFileLabel = ref<string>('')
 if (props.displayType === 'input') {
   listFileLabel.value = props.fileInfo.showName || ''
 }
+let limitNum = ref(null)
+if(props.limit){
+  limitNum.value = props.limit
+} else if(props.multiple){
+  limitNum.value = 9
+} else {
+  limitNum.value = 1
+}
 const onInputUploadSuccess = (res: any) => {
   if (listFileLabel.value) {
     listFileLabel.value = listFileLabel.value + ',' + res.showName

package/packages/index.js

@@ -37,6 +37,8 @@ import DepartmentTreeMobile from './department-tree-mobile'
 import DepartmentUserTreeMobile from './department-user-tree-mobile'
 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 * as ElementPlusIconsVue from "@element-plus/icons-vue"
 // 将所有组件都存储起来,方便后续统一注册
 const components = [
@@ -73,7 +75,9 @@ const components = [
   DepartmentTreeMobile,
   DepartmentUserTreeMobile,
 	SuperIcon,
-	FsUploadNew
+	FsUploadNew,
+  ScanCodeInputBrowser,
+  WorkgroupTreeMobile
 ]
 
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
@@ -131,7 +135,9 @@ export {
   DepartmentTreeMobile,
   DepartmentUserTreeMobile,
 	SuperIcon,
-	FsUploadNew
+	FsUploadNew,
+  ScanCodeInputBrowser,
+  WorkgroupTreeMobile
 }
 
 export default {

package/packages/organization-input/src/organization-input.vue

@@ -7,6 +7,7 @@
 		      :readonly="true"
 		      :size="size"
 		      type="text"
+			  :placeholder="$t('imatrixUIMessage.pleaseSelect')"
       >
         <template v-slot:append>
 	        <el-icon v-slot:suffix class="el-input__icon"><el-icon-search/></el-icon>
@@ -20,6 +21,7 @@
 		      :readonly="true"
 		      :size="size"
 		      type="text"
+			  :placeholder="$t('imatrixUIMessage.pleaseSelect')"
 		      @click="showOrganizationTree(false)"
 			  @change="changeEvent"
       >
@@ -56,6 +58,7 @@
     <workgroup-tree
 		    v-if="treeType && treeType === 'WgTree' && showOrganizationTreeFlag"
 		    :multiple="typeof multiple === 'undefined' ? false : multiple"
+		    :branch-info="departmentInfo"
 		    :search-field="searchField"
 		    :select-workgroup-info="selectOrganizationInfo"
 		    :separator="separator"

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 = Vue.prototype.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/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/super-grid/src/apis.js

@@ -1375,6 +1375,18 @@ 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
   }
 }
 export default apis