centaline-data-driven-v3 0.0.44 → 0.0.46

package/src/components/web/photo.vue

@@ -10,28 +10,25 @@
             <span v-html="model.preLabel1"></span>
           </div>
         </div>
-
-
         <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 : '']">
-          <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"
-            :on-progress="uploadProcess" :on-exceed="handleExceed" :show-file-list="false"  >
+            :on-progress="uploadProcess" :on-exceed="handleExceed" :show-file-list="false">
 
 
             <el-icon class="avatar-uploader-icon"
               :style="{ 'width': (model.maxValue1 || 100) + 'px', 'height': (model.minValue1 || 100) + 'px', background: 'var(--el-fill-color-lighter)' }">
-           
+
               <template v-if="model.fileList && model.fileList.length > 0">
                 <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 ? '39px' : '0' }">
+                    <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)">
@@ -49,6 +46,7 @@
                           <Delete />
                         </el-icon>
                       </span>
+
                     </span>
                     <el-image fit="fill"
                       :src="file.url ? file.url : file.mediaUrl ? file.mediaUrl + '/' + (model.maxValue1 || 100) + '/' + (model.minValue1 || 100) : util.getAssetsImage('blank.png')"
@@ -77,9 +75,12 @@
                 </div>
               </template>
               <template v-else-if="model.name1">
-                <img :src="model.name1 ? model.name1 : util.getAssetsImage('blank.png')" class="avatar" /></template>
+                <img :src="model.name1 ? model.name1 : util.getAssetsImage('blank.png')" class="avatar" />
+              </template>
               <template v-else>
+
                 <Plus :style="{ 'font-size': '30px', 'color': 'var(--el-text-color-secondary)' }" />
+
               </template>
             </el-icon>
 
@@ -91,8 +92,11 @@
               <div v-show="model.description" v-html="model.description">
               </div>
             </template>
-            <img class="qrcode-target" @click.stop="qrcodeFn" ref="QRCodeRef" v-if="model.QRCodeAction"
-              :src="util.getAssetsImage('serw1.png')" style="width: 35px;height: 35px;" alt="扫码上传" title="扫码上传">
+            <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>
             <div class="ScanUploadPhoto" v-if="model.qrcodeVisible" @click.stop="qrcodeVisible = true"
               :style="{ top: model.QRCodeRefTop + 'px', left: model.QRCodeRefLeft + 'px' }">
               <div style="border-bottom:none">
@@ -139,11 +143,10 @@ const props = defineProps({
 })
 const refct_Photo = ref()
 const refupload = ref()
-const QRCodeRef = ref()
-
+const QRCodeRef = ref() 
 const UploadhttpRequest = ref({})
+const model = ref(null) 
 
-const model = ref(null)
 const headers = computed(() => {
   return common.getDataDrivenOpts().handler.getRequestHeaders();
 })
@@ -175,6 +178,8 @@ function action() {
   return "";
 }
 
+
+
 function load(data) {
   model.value = data;
   model.value.validExcute = () => {
@@ -315,7 +320,7 @@ async function SliceUpload(options) {
   }
   // data是上传时附带的额外参数，file是文件
 
-  let uid = model.value.uploadguid;
+  let uid = Photo.uploadguid();
   try {
     file.uid = file.uid || uid;
 
@@ -357,7 +362,7 @@ function uploadpro(uploadOptions, res, xhr, flagError) {
 
       if (res.content.finished == 1) {
         handleChange();
-        QRCodeLocate(); 
+        QRCodeLocate();
       }
       return true;
     }
@@ -471,13 +476,66 @@ function QRCodeLocate() {
 function viewerfile(file) {
   Photo.viewerfile(file, model.value)
 }
+ 
+function PasteUpload(event) {
+  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) { 
+
+    var target = event.target;
+    const uploads =  document.querySelectorAll('[uploadStatus="upload"]');
+
+    if (!window.uploads) {
+      window.uploads = { count: 0, length: uploads.length };
+    }
+    if (uploads.length > 1) {
+      window.uploads.count = window.uploads.count + 1;
+      window.uploads.length = uploads.length;
+
+      if (window.uploads.count == window.uploads.length) {
+        window.uploads = null;
+        ElMessage({
+          message: "存在多个上传组件，请点击上传！",
+          type: 'info',
+          showClose: true,
+        });
+        return false;
+      }
+    }
+    else if (uploads.length == 1) {
+      window.uploads = null;
+      PasteUpload(event);
+    }
+  
+}
+
+// 添加粘贴事件监听器
+document.addEventListener('paste', ListenerPaste);
 onBeforeUnmount(() => {
   //销毁定时上传
   clearTimeout(model.value.qrtimer);
   window.removeEventListener('scroll', model.value.QRCodeLocate, true)
+  //销毁贴事件监听器 
+  document.removeEventListener('paste', ListenerPaste)
 })
-
 defineExpose({
   model
 })
@@ -610,10 +668,12 @@ defineExpose({
 
 :deep(.qrcode-target) {
   position: absolute;
-  top: 3px;
-  right: 3px;
+  right: 3px; 
   width: 35px;
   height: 35px;
+  color: red;
+  text-align: right;
+  top: 0px;
 }
 
 :deep(.ScanUploadPhoto) {

package/src/loader/src/Form.js

@@ -101,7 +101,6 @@ function loadFromModel(source, isFormList) {
               rtn1["options"][0]["label"] = attrValue
             }
           }
-          this.form.$vue.itemKey = Math.random()
           hiddenHandle(rtn1, this.form);
           requiredHandle(rtn1, this.form);
         }

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;
                 }
             },
@@ -740,9 +740,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_51301be3-2d94-4a7a-9dec-2747b124d057",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_51301be3-2d94-4a7a-9dec-2747b124d057",Platform:"WEB"}',
+                authObject: '{EmpID:"Token_de95f4d5-ff59-4e26-bcbc-0581d420ca06",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_de95f4d5-ff59-4e26-bcbc-0581d420ca06",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;

package/src/utils/mixins.js

@@ -2,6 +2,7 @@ import { ref } from 'vue'
 import Field from '@/loader/src/Field';
 import common from './common';
 import Enum from './Enum';
+import { showLoadingToast,closeToast} from "vant";
 
 
 //初始化数据
@@ -144,6 +145,9 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                     if (verified) {
                         //action有值，提交到后台
                         if (field.action) {
+                            if(common.flagApp()){
+                                showLoadingToast({ message: '正在处理',forbidClick: true, duration: 100000 });
+                            }
                             field.disabled = true;//提交按钮禁用
                             model.pageDisabled = true;
 
@@ -162,6 +166,9 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                         progressKey: res.content.key,
                                                         progressType: field.isExport ? 'export' : 'import',
                                                         onFinished(data) {
+                                                            if(common.flagApp()){
+                                                                closeToast()
+                                                            }
                                                             field.disabled = false;
                                                             model.pageDisabled = false;
                                                             common.closeDialog(dialogOption);
@@ -192,6 +199,9 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                             model.$vue.emit('submit', { formData: model, responseData: data });
                                                         },
                                                         onError(data) {
+                                                            if(common.flagApp()){
+                                                                closeToast()
+                                                            }
                                                             field.disabled = false;
                                                             model.pageDisabled = false;
                                                             common.closeDialog(dialogOption);
@@ -223,6 +233,9 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                                     progressKey: res202.content.key,
                                                                     progressType: field.isExport ? 'export' : 'import',
                                                                     onFinished(data) {
+                                                                        if(common.flagApp()){
+                                                                            closeToast()
+                                                                        }
                                                                         field.disabled = false;
                                                                         model.pageDisabled = false;
                                                                         common.closeDialog(dialogOption);
@@ -253,6 +266,9 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                                         model.$vue.emit('submit', { formData: model, responseData: data });
                                                                     },
                                                                     onError(data) {
+                                                                        if(common.flagApp()){
+                                                                            closeToast()
+                                                                        }
                                                                         field.disabled = false;
                                                                         model.pageDisabled = false;
                                                                         common.closeDialog(dialogOption);
@@ -266,6 +282,9 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                                 }
                                             });
                                         }).catch(() => {
+                                            if(common.flagApp()){
+                                                closeToast()
+                                            }
                                             field.disabled = false;
                                             model.pageDisabled = false;
                                         });
@@ -274,6 +293,9 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                             }
                             else {
                                 field.doAction(model.$vue.getFormObj(), (data) => {
+                                    if(common.flagApp()){
+                                        closeToast()
+                                    }
                                     field.disabled = false;
                                     model.pageDisabled = false;
                                     if (data.rtnCode === Enum.ReturnCode.Successful) {

package/src/views/SearchList.vue

@@ -1,7 +1,8 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyTenderList/getLayoutOfSearch'"
-      :searchDataApi="'/propertyTenderList/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
+      :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
+      :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>