centaline-data-driven-v3 0.0.45 → 0.0.47

package/src/components/web/PhotoSelect.vue

@@ -6,9 +6,10 @@
 
                     <li class="el-upload-list__item is-success" v-bind:key="index">
                         <div class="cover-list-item">
-                            <el-image fit="fill" :src="element.thumbnailUrl" style="width: 100px; height: 100px"
-                                @click.stop="viewerfile(model.fileList, index)">
-                            </el-image>
+                            <div @click.stop="viewerfile(model.fileList, index)">
+                                <el-image fit="fill" :src="element.thumbnailUrl" style="width: 100px; height: 100px">
+                                </el-image>
+                            </div>
                             <span class="cover-list-item-play" v-if="element.videoPlayIconUrl">
                                 <div class="swiper-i" @click.stop="viewerfile(model.fileList, index)">
                                     <img :src="element.videoPlayIconUrl" class="hous-icon" />
@@ -197,19 +198,24 @@ function selfValidExcute(eventName) {
 }
 
 function viewerfile(list, index) {
+    var file = list[index];
+    if (file && file.mediaTypeID == 4 && !common.isVideoFile(file.mediaUrl)) {
+        window.open(file.mediaUrl)
+    }
+    else {
+        var MediaAlbum = [{ albumName: model.value.controlLabel || "媒体", medias: [] as any }];
 
-    var MediaAlbum = [{ albumName: model.value.controlLabel || "媒体", medias: [] as any }];
+        let fileList = list.filter((item) => {
+            return item.flagDeleted !== true;
+        });
+        fileList.forEach((v) => {
+            MediaAlbum[0].medias.push(v);
+        });
+        common.viewerfile((model.value.controlLabel || "预览媒体"), MediaAlbum, 0, index, model.value.mediaViewPageType);
+    }
 
-    let fileList = list.filter((item) => {
-        return item.flagDeleted !== true;
-    });
-    fileList.forEach((v) => {
-        MediaAlbum[0].medias.push(v);
-    });
-    common.viewerfile((model.value.controlLabel || "预览媒体"), MediaAlbum, 0, index, model.value.mediaViewPageType);
 }
 
-
 defineExpose({
     model
 })

package/src/components/web/PhotoSelectList.vue

@@ -211,13 +211,7 @@ function allchoose() {
 function handleClick() {
     if (chooseList.value && chooseList.value.length > 0) {
         emit('handlePhoto', chooseList.value);
-    } else {
-        ElMessage({
-            message: "请选择至少一张图片",
-            type: 'warning',
-            showClose: true,
-        });
-    }
+    } 
 }
 function rolRouterCellClickHandler(routerKey, rowindex, sourceIndex) {
     if (routerKey == 'photoPreview') {
@@ -225,16 +219,21 @@ function rolRouterCellClickHandler(routerKey, rowindex, sourceIndex) {
     }
 }
 function viewerfile(list, index) {
+    var file = list[index];
+    if (file && file.mediaTypeID == 4 && !common.isVideoFile(file.mediaUrl)) {
+        window.open(file.mediaUrl)
+    }
+    else {
+        var MediaAlbum = [{ albumName: model.value.label || "媒体", medias: [] as any }];
 
-    var MediaAlbum = [{ albumName: model.value.label || "媒体", medias: [] as any }];
-
-    let fileList = list.filter((item) => {
-        return item.flagDeleted !== true;
-    });
-    fileList.forEach((v) => {
-        MediaAlbum[0].medias.push(v);
-    });
-    common.viewerfile((model.value.label || "预览媒体"), MediaAlbum, 0, index, props.mediaViewPageType);
+        let fileList = list.filter((item) => {
+            return item.flagDeleted !== true;
+        });
+        fileList.forEach((v) => {
+            MediaAlbum[0].medias.push(v);
+        });
+        common.viewerfile((model.value.label || "预览媒体"), MediaAlbum, 0, index, props.mediaViewPageType);
+    }
 }
 function change() {
     loading.value = true;

package/src/components/web/SearchList/SearchStats.vue

@@ -160,7 +160,7 @@ function load(data) {
         });
         if (selectStats.value == '') {
             var m = data.source.content.find((v) => {
-                return v.code1 === props.apiParam[fieldName1.value];
+                return v.code1 == props.apiParam[fieldName1.value];
             });
             if (m) {
                 selectStats.value = m.key

package/src/components/web/ViewerFile.vue

@@ -50,10 +50,10 @@
                     </div>
                     <div class="toggler" @click="mediaLabelShow=!mediaLabelShow" v-if="itemFile.mediaLabelName||itemFile.mediaDescCN||itemFile.mediaDescEN||itemFile.mediaUploadEmployeeDesc">
                         <span class="glyphicon glyphicon-chevron-right" v-if="mediaLabelShow">
-                            <el-icon><ArrowRightBold /></el-icon>
+                            <el-icon color="#000000"><ArrowRightBold /></el-icon>
                         </span>
                         <span class="glyphicon glyphicon-chevron-left" v-if="!mediaLabelShow">
-                            <el-icon><ArrowLeftBold /></el-icon>
+                            <el-icon color="#000000"><ArrowLeftBold /></el-icon>
                         </span>
                     </div>
                 </div>
@@ -486,16 +486,17 @@ html {
 .cont {
     position: absolute;
     z-index: 100000000000000;
-    color: black;
+    color: #ffffff;
     width: auto;
     display: inline-block !important;
     display: inline;
     background-color: #ffffff00;
     font-size: 12px;
+    background: rgba(0, 0, 0, .45);
 }
 
 .enlarge-picture {
-    padding: 5px 0;
+    padding: 5px 10px;
 }
 .toggler {
     -webkit-border-top-right-radius: 4px;

package/src/components/web/other/PopupSearchListTable.vue

@@ -10,7 +10,7 @@
                 <template v-else>
                     <el-table-column width="50" fixed="left">
                         <template #default="scope">
-                            <el-radio v-model="model.selectIndex" :disabled="!scope.row.flagSelect"
+                            <el-radio v-model="model.selectIndex" :disabled="!flagSelect(scope.row)"
                                 :label="scope.$index">&nbsp;</el-radio>
                         </template>
                     </el-table-column>
@@ -111,7 +111,7 @@ function loadFields() {
 
 }
 function selectable(row) {
-    if (row.flagSelect === false) {
+    if (flagSelect(row) === false) {
         return false;
     }
     return true;
@@ -136,13 +136,13 @@ function handleSelectionChange(val) {
 }
 //当单选项发生变化时会触发该事件
 function handleCurrentChange(val) {
-    if (val && val.flagSelect === false) {
+    if (val && flagSelect(val) === false) {
         return;
     }
     currentRow.value = val;
 }
 function handleCellClick(row) {
-    if (row.flagSelect === false) {
+    if (flagSelect(row) === false) {
         return;
     }
     model.value.selectIndex = row.tableIndex;
@@ -211,13 +211,16 @@ function confirmClickHandler() {
         emit('submit', multipleSelection.value);
     }
 }
+function flagSelect(row){
+    if(!model.value.rightCheckBoxColumn || common.getDataOfUpperLower(row, model.value.rightCheckBoxColumn) == 1){
+       return true;
+    }
+    return false;
+}
 //重置列宽（自适应列宽）
 function resetTabelWidth() {
     model.value.columns.forEach((c) => {
         tableData.value.forEach((t) => {
-            if (t.flagSelect !== false) {
-                t.flagSelect = true;
-            }
             var colStr = t[c.id];//动态获取每列的属性值
             c.maxLen = c.maxLen ? c.maxLen : common.strCharLen(c.name);
             c.maxLen = c.maxLen > common.strCharLen(colStr) ? c.maxLen : common.strCharLen(colStr);

package/src/components/web/photo.vue

@@ -13,11 +13,8 @@
         <div style="width: 100%;position: relative" ref="refct_Photo" class="block ct-file"
           :style="{ 'width': (model.maxValue1 || 100) + 'px', 'height': (model.minValue1 || 100) + 'px' }"
           :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']">
-          
-        <input style="position: absolute;width: 0px;height: 0px; top: 13px;left: 5px" source="upload" type="text"
-          placeholder="粘贴上传" @paste="handlePaste" ref="refPasteUpload" />
-
-          <el-upload :class="model.disableUpload ? 'ct-upload-display-none' : ''" v-bind="UploadhttpRequest"
+ 
+          <el-upload :class="model.disableUpload ? 'ct-upload-display-none' : ''" v-bind="UploadhttpRequest"  :uploadStatus="!model.disableUpload&&!model.locked?'upload':'lock'"
             ref="refupload" :disabled="model.locked" :accept="model.fileAccept1" :on-change="handleChange"
             :multiple="false" :auto-upload="true" :action="action()" :headers="headers"
             :before-upload="beforeUploadProcess" :on-success="handleAvatarSuccess" :on-error="handleAvatarError"
@@ -31,7 +28,7 @@
                 <div :style="{ 'width': (model.maxValue1 || 100) + 'px', 'height': (model.minValue1 || 100) + 'px' }"
                   :title="file.fileName" v-for="(file, index) in model.fileList">
                   <div class="cover-list-item">
-                    <span class="tool-top" :style="{ right: (model.QRCodeAction ? '54px' : '17px') }">
+                    <span class="tool-top" :style="{ right: (model.QRCodeAction ? '39px' : '2px') }">
 
                       <span v-if="!model.locked && file.rightCrop && file.mediaTypeID == 2" style="cursor: pointer;">
                         <el-icon @click.stop="handleEdit(file)">
@@ -95,16 +92,10 @@
               <div v-show="model.description" v-html="model.description">
               </div>
             </template>
-            <div class="qrcode-target">
-              <img @click.stop="qrcodeFn" ref="QRCodeRef" v-if="model.QRCodeAction"
+            <div class="qrcode-target" v-if="model.QRCodeAction">
+              <img @click.stop="qrcodeFn" ref="QRCodeRef" 
                 :src="util.getAssetsImage('serw1.png')" style="width: 35px;height: 35px; float: right; " alt="扫码上传"
-                title="扫码上传" />
-              <div style="cursor: pointer;height: 16px;line-height: 16px; float: right;" @click.stop="getFocus">
-                <el-icon title="粘贴上传">
-                  <DocumentCopy />
-                </el-icon>
-              </div>
-
+                title="扫码上传" /> 
             </div>
             <div class="ScanUploadPhoto" v-if="model.qrcodeVisible" @click.stop="qrcodeVisible = true"
               :style="{ top: model.QRCodeRefTop + 'px', left: model.QRCodeRefLeft + 'px' }">
@@ -152,11 +143,9 @@ const props = defineProps({
 })
 const refct_Photo = ref()
 const refupload = ref()
-const QRCodeRef = ref()
-const refPasteUpload = ref()
+const QRCodeRef = ref() 
 const UploadhttpRequest = ref({})
-const model = ref(null)
-const flagPasteUpload = ref(false);
+const model = ref(null) 
 
 const headers = computed(() => {
   return common.getDataDrivenOpts().handler.getRequestHeaders();
@@ -487,41 +476,32 @@ function QRCodeLocate() {
 function viewerfile(file) {
   Photo.viewerfile(file, model.value)
 }
-
-function getFocus() {
-  refPasteUpload.value.focus();
-}
-
-function handlePaste(event) {
-  flagPasteUpload.value = true;
-  PasteUpload(event);
-}
-
+ 
 function PasteUpload(event) {
-
-  // 获取粘贴板中的图片
-  const clipboardDatas = (event.clipboardData || event.originalEvent.clipboardData);
-  const items = clipboardDatas.items;
-  for (let index in items) {
-    const item = items[index];
-    if (item.kind === 'file') {
-
-      const file = item.getAsFile();
-      let uid = Photo.uploadguid();
-
-      file.uid = file.uid || uid;
-      refupload.value.handleStart(file);
-      // 提交上传队列
-      refupload.value.submit();
+  if (!model.value.locked) {
+    // 获取粘贴板中的图片
+    const clipboardDatas = (event.clipboardData || event.originalEvent.clipboardData);
+    const items = clipboardDatas.items;
+    for (let index in items) {
+      const item = items[index];
+      if (item.kind === 'file') {
+
+        const file = item.getAsFile();
+        let uid = Photo.uploadguid();
+
+        file.uid = file.uid || uid;
+        refupload.value.handleStart(file);
+        // 提交上传队列
+        refupload.value.submit();
+      }
     }
   }
-
 }
 
-function ListenerPaste(event) {
-  if (!flagPasteUpload.value) {
+function ListenerPaste(event) { 
+
     var target = event.target;
-    const uploads = document.querySelectorAll('input[source="upload"]');
+    const uploads =  document.querySelectorAll('[uploadStatus="upload"]');
 
     if (!window.uploads) {
       window.uploads = { count: 0, length: uploads.length };
@@ -533,7 +513,7 @@ function ListenerPaste(event) {
       if (window.uploads.count == window.uploads.length) {
         window.uploads = null;
         ElMessage({
-          message: "存在多个上传组件，请点击粘贴上传！",
+          message: "存在多个上传组件，请点击上传！",
           type: 'info',
           showClose: true,
         });
@@ -544,11 +524,7 @@ function ListenerPaste(event) {
       window.uploads = null;
       PasteUpload(event);
     }
-  }
-  else {
-    flagPasteUpload.value = false;
-  }
-
+  
 }
 
 // 添加粘贴事件监听器
@@ -692,8 +668,8 @@ defineExpose({
 
 :deep(.qrcode-target) {
   position: absolute;
-  right: 3px;
-  width: 50px;
+  right: 3px; 
+  width: 35px;
   height: 35px;
   color: red;
   text-align: right;

package/src/loader/src/SearchScreen.js

@@ -56,7 +56,7 @@ function loadSearchScreenModel(source, prevParam) {
                     continue;
                 }
                 if ((source.fields[key].controlType === Enum.ControlType.DateRange
-                    || source.fields[key].controlType===Enum.ControlType.Location
+                    || source.fields[key].controlType === Enum.ControlType.Location
                     || source.fields[key].controlType === Enum.ControlType.DateTimeRange)
                     && source.fields[key].code2 == undefined) {
                     source.fields[key].code2 = '';
@@ -76,7 +76,8 @@ function loadSearchScreenModel(source, prevParam) {
                 return v.controlType === Enum.ControlType.ButtonSearch;
             });
             var screens = rtn.sourceFieldsArr.filter((v, i) => {
-                return (advIndex === -1 || i < advIndex) && v.controlType !== Enum.ControlType.From;
+                return (advIndex === -1 || i < advIndex) && v.controlType !== Enum.ControlType.From
+                    || v.controlType == Enum.ControlType.Hidden;
             });
 
             rtnscreens = this.initScreen(screens);
@@ -221,34 +222,34 @@ function loadSearchScreenModel(source, prevParam) {
             });
             return rtn;
         },
-        get searchDataOfHide() {      
+        get searchDataOfHide() {
             var rtn = {
-              fields: []
+                fields: []
             };
             this.screen.forEach((v) => {
-              if(v.controlType===Enum.ControlType.Hidden){
-                var tempObj = common.deepClone(v.searchObj);          
-                if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
-                  if(isHandle(v.controlType)){
-                    tempObj.searchValue1=getNewSearchValue(tempObj); 
-                  }
-                  rtn.fields.push(tempObj);           
+                if (v.controlType === Enum.ControlType.Hidden) {
+                    var tempObj = common.deepClone(v.searchObj);
+                    if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
+                        if (isHandle(v.controlType)) {
+                            tempObj.searchValue1 = getNewSearchValue(tempObj);
+                        }
+                        rtn.fields.push(tempObj);
+                    }
                 }
-              }
             });
             this.highScreen.forEach((v) => {
-              if(v.controlType===Enum.ControlType.Hidden){
-                var tempObj = common.deepClone(v.searchObj);
-                if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
-                  if(isHandle(v.controlType)){
-                    tempObj.searchValue1=getNewSearchValue(tempObj); 
-                  }
-                  rtn.fields.push(tempObj);
+                if (v.controlType === Enum.ControlType.Hidden) {
+                    var tempObj = common.deepClone(v.searchObj);
+                    if ((tempObj.searchValue1 && tempObj.searchValue1 !== '') || (tempObj.searchValue2 && tempObj.searchValue2 !== '')) {
+                        if (isHandle(v.controlType)) {
+                            tempObj.searchValue1 = getNewSearchValue(tempObj);
+                        }
+                        rtn.fields.push(tempObj);
+                    }
                 }
-              }
             });
             return rtn;
-          },
+        },
         //绑定联动参数组件
         getRefFieldPara(refFieldNameArr) {
             let submitData = {};
@@ -397,7 +398,7 @@ function hiddenHandle(item, model) {
         }
     }
 }
-function getAction(api,  callback) {
+function getAction(api, callback) {
     request.postHandler(common.globalUri(), {
         action: api
     })

package/src/loader/src/SearchTable.js

@@ -169,13 +169,13 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
         },
         //查询数据
         sortData: [],
-        sortString:'',
+        sortString: '',
         pageData: {
             get orderBy() {
                 if (rtn.sortData.length > 0) {
                     return rtn.sortData[0].sortName + ' ' + rtn.sortData[0].sortAction;
                 }
-                else if(rtn.sortString){
+                else if (rtn.sortString) {
                     return rtn.sortString;
                 }
             },
@@ -196,7 +196,13 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                 if (this.$vue && this.$vue.searchStrat && this.$vue.searchEnd) {
                     let searchTotal = this.$vue.searchEnd - this.$vue.searchStrat;
                     if (searchTotal > 0) {
-                        data = data + " 总耗时 " + searchTotal + " 毫秒";
+                        if (data.indexOf('总耗时') > -1 || data.indexOf('總耗時') > -1) {
+                            data = data + " " + searchTotal + " 毫秒";
+                        }
+                        else {
+                            data = data + " 总耗时 " + searchTotal + " 毫秒";
+                        }
+
                     }
                 }
                 return data;
@@ -740,9 +746,14 @@ function apiData(model, callback) {
                     else {
                         if (!common.flagApp()) {
                             model.$vue.refreshTableColumns(response);
+                        } else {
+                            model.$vue.loadStats();
                         }
                     }
                 }
+                else {
+                    model.$vue.loadStats();
+                }
                 if (response.content.updateToolButtons) {
                     if (response.content.toolButtons) {
                         model._buttons = [];

package/src/main.js

@@ -26,7 +26,7 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
     flagRouterSelf: true,
-    flagApp: false,//是否app端
+    flagApp: true,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: true,
@@ -63,7 +63,7 @@ app.use(centaline, {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"1647-1802885825978044416",platform:"WEB"}',
-                authObject: '{EmpID:"Token_2fdaf18a-b466-4022-a084-8040775a1787",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_2fdaf18a-b466-4022-a084-8040775a1787",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_7b4fbffd-3089-4925-87ed-bb85c501f81a",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_7b4fbffd-3089-4925-87ed-bb85c501f81a",Platform:"IOS"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/router/index.js

@@ -3,7 +3,6 @@ import form from "@/views/Form.vue"
 import Search from '@/views/SearchList.vue'
 import Tree from '@/views/Tree.vue'
 import container from '@/views/container.vue'
-import appContainer from '@/views/appContainer.vue'
 
 const routes = [
   {
@@ -27,11 +26,6 @@ const routes = [
     path: "/container",
     name: "container",
     component: container
-  },
-  {
-    path: "/appContainer",
-    name: "appContainer",
-    component: appContainer
   }
 ]
 

package/src/utils/common.js

@@ -1,4 +1,4 @@
-import { showConfirmDialog, showToast,showDialog } from 'vant';
+import { showConfirmDialog, showToast, showDialog } from 'vant';
 import { ElMessage } from 'element-plus'
 let dataDrivenOpts = {}
 const common = {
@@ -280,7 +280,10 @@ const common = {
   message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {
     if (dataDrivenOpts.flagApp) {
       if (this.hasHtml(message)) {
-        showDialog({ message: message,allowHtml:true });
+        showDialog({ message: message, allowHtml: true });
+      }
+      else if(type=='error'){
+        showDialog({ title: '提示', message:message, closeOnClickOverlay: true, confirmButtonText: '确定', className: 'showDialogMessage' });
       }
       else {
         showToast(message);
@@ -860,5 +863,9 @@ const common = {
       return document.body;
     }
   },
+  isVideoFile(url) {
+    const videoExtensions = /\.(mp4|mov|webm|avi|wmv|flv)$/i;
+    return videoExtensions.test(url);
+  },
 };
 export default common;