centaline-data-driven-v3 0.0.93 → 0.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.93",
+  "version": "0.0.95",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/app/Form.vue

@@ -82,7 +82,7 @@
             <div class="safe-area-inset-bottom-height"></div>
         </div>
         <div class="button-absoluteAPP"
-            v-if="(common.flagMicroMessenger() || common.flagHK()) && model.buttons.findIndex((v) => { return v.show }) > -1">
+            v-if="(common.flagMicroMessenger() || common.flagHK()) && model.buttons.findIndex((v) => { return v.show }) > -1 && buttonShow">
             <template v-for="(field, index) in model.buttons" :key="index">
                 <component v-if="field.show !== false" ref="Fields" :is="field.is" :vmodel="field"
                     :parameterAction="model.parameterAction" v-bind="field.bindPara" @fieldClick="clickHandler" />
@@ -150,6 +150,7 @@ const refForm = ref()
 const buttons = ref([])
 const actions = ref([])
 const show = ref(false)
+const buttonShow = ref(true)
 init()
 //初始化数据
 function init() {
@@ -159,15 +160,11 @@ function init() {
     if (isAndroid) {
         // 动态检测键盘状态
         let viewportHeight = window.innerHeight;
-
         window.addEventListener('resize', () => {
-            const newHeight = window.innerHeight;
-            const keyboardHeight = viewportHeight - newHeight;
-
-            if (keyboardHeight > 100) { // 键盘弹出
-                document.querySelector('.button-absoluteAPP').style.bottom = `${keyboardHeight}px`;
-            } else { // 键盘收起
-                document.querySelector('.button-absoluteAPP').style.bottom = '0';
+            if (window.innerHeight < viewportHeight) {
+                buttonShow.value = false
+            } else {
+                buttonShow.value = true
             }
         });
     }

package/src/components/app/ViewerFile/ViewerP360.vue

@@ -23,6 +23,9 @@ onMounted(() => {
 function init() {
     loading.value = true
     if (panoramaContainer.value) {
+        if (PSV.value) {
+            PSV.value.destroy(); // 销毁旧实例
+        }
         PSV.value = new PhotoSphereViewer({
             container: panoramaContainer.value,
             panorama: props.imgUrl, // 替换为你的全景图片路径  
@@ -66,7 +69,7 @@ function enterFullscreen() {
 }
 
 
-watch(() => props.src, () => {
+watch(() => props.imgUrl, () => {
     init();
     //complete();
 })

package/src/components/web/CheckBoxList.vue

@@ -11,7 +11,7 @@
                         <span v-html="item.name" style="line-height: 16px;"></span>
                         <el-icon :size="18" v-if="item.toolTip" style="margin-left: 5px;">
                             <el-tooltip  raw-content :content="item.toolTip" placement="top" effect="light">
-                                <WarningFilled />
+                                <InfoFilled />
                             </el-tooltip>
                         </el-icon>
                     </el-checkbox>

package/src/components/web/ViewerFile/ViewerP360.vue

@@ -20,6 +20,9 @@ onMounted(() => {
 
 function init() {
     if (panoramaContainer.value) {
+        if (PSV.value) {
+            PSV.value.destroy(); // 销毁旧实例
+        }
         PSV.value = new PhotoSphereViewer({
             container: panoramaContainer.value,
             panorama: props.imgUrl, // 替换为你的全景图片路径  
@@ -74,7 +77,7 @@ const viewerHeight = computed(() => {
         return props.height
     }
 })
-watch(() => props.src, () => {
+watch(() => props.imgUrl, () => {
     init();
     //complete();
 })

package/src/loader/src/SearchScreen.js

@@ -3,7 +3,6 @@ import LibFunction from './LibFunction';
 import Enum from '../../utils/Enum';
 import common from '../../utils/common';
 import request from '../../utils/request';
-import formData from '../../utils/formData';
 
 function loadSearchScreenApi(action, callBack, screenPara, prevParam, failCallBack) {
     if (action) {
@@ -28,7 +27,398 @@ function loadSearchScreenApi(action, callBack, screenPara, prevParam, failCallBa
 }
 function loadSearchScreenModel(source, prevParam) {
     let rtn = {
-        formData:formData,
+        formData:{
+            form: null,
+              formTable: null,
+              excuteData: null,//fields
+              fieldsDic: null,//fieldsDic
+              source:null,
+              _excuteListData: undefined,
+              enableRelationFields(FlagRelation) {
+                this.form.enableRelationFields = FlagRelation
+              },
+              //获取code1
+              getCode1ByField1(id) {
+                var rtn1 = this.fieldsDic[id];
+                if (rtn1) {
+                  return rtn1.code1;
+                }
+              },
+        
+              //获取code2
+              getCode2ByField1(id) {
+                var rtn1 = this.fieldsDic[id];
+                if (rtn1) {
+                  return rtn1.code2;
+                }
+              },
+              setActionRouter(id, attrKey, attrValue) {
+                var router = this.form.actionRouters.find((v1) => {
+                  return v1.key === id;
+                });
+                if (router) {
+                  router[attrKey] = attrValue;
+                }
+              },
+              //获取Field的属性attrKey的值
+              getValueByFieldName(id, attrKey) {
+                attrKey = common.initialsToLowerCase(attrKey);
+                var rtn1 = this.fieldsDic[id];
+                if (rtn1) {
+                  return rtn1[attrKey];
+                }
+              },
+              getValueByFieldNameFromParent(id, attrKey) {
+                if (this.form && this.form.parentModelForm) {
+                  return this.form.parentModelForm.getValueByFieldName(id, attrKey);
+                }
+                return null;
+              },
+              //设置Field的属性attrKey的值
+              setValueByFieldName(id, attrKey, attrValue) {
+                attrKey = common.initialsToLowerCase(attrKey);
+                var rtn1 = this.fieldsDic[id];
+                if (rtn1) {
+                  if (attrKey == 'code1' && rtn1.controlType === Enum.ControlType.NumericTextBox
+                    && attrValue != undefined && attrValue != null && attrValue != '') {
+                    if (rtn1.decimals1 != undefined && rtn1.decimals1 != null && rtn1.decimals1 > -1) {
+                      attrValue = Number(attrValue).toFixed(rtn1.decimals1)
+                    }
+                  }
+                  else if (attrKey == 'code1' && (rtn1.controlType === Enum.ControlType.File
+                    || rtn1.controlType === Enum.ControlType.SliceUpload || rtn1.controlType === Enum.ControlType.PhotoSelect)
+                    && attrValue != undefined && attrValue != null && attrValue != '') {
+                    rtn1.jsSetFile(attrValue, rtn1);
+                  }
+                  rtn1[attrKey] = attrValue;
+                  if (rtn1.controlType === Enum.ControlType.Tags) {
+                    rtn1["value"] = JSON.parse(attrValue);
+                  }
+                  if (rtn1.controlType === Enum.ControlType.SearchListBox
+                    || rtn1.controlType === Enum.ControlType.ComboBox
+                    || rtn1.controlType === Enum.ControlType.MultiSelectWithSearch
+                    || rtn1.controlType === Enum.ControlType.MultiSelectNoSearch
+                  ) {
+                    if (rtn1["options"].length == 0) {
+                      rtn1["options"] = [{ value: '', label: '' }];
+                    }
+                    if (attrKey == 'code1') {
+                      rtn1["value"] = attrValue;
+                      rtn1["options"][0]["value"] = attrValue
+                    }
+                    if (attrKey == 'name1') {
+                      rtn1["options"][0]["label"] = attrValue
+                    }
+                    if (rtn1.itemKey) rtn1.itemKey = Math.random()
+                  }
+                  if (rtn1.is == 'ct-button') {
+                    if (common.flagApp() && this.form.$vue.loaded) {
+                      this.form.$vue.loaded(this.form)
+                    }
+                  }
+                  this.source.hiddenHandle(rtn1, this.form);
+                  if(this.source.requiredHandle){
+                    this.source.requiredHandle(rtn1, this.form);
+                  }
+                }
+              },
+              setValueByFieldNameFromParent(id, attrKey, attrValue) {
+                if (this.form && this.form.parentModelForm) {
+                  return this.form.parentModelForm.setValueByFieldName(id, attrKey, attrValue);
+                }
+                return null;
+              },
+              //设置Field的v1、v2的值
+              setV1AndV2ByField1(id, code1, code2) {
+                var rtn1 = this.fieldsDic[id];
+                if (rtn1) {
+                  if (typeof rtn1.code1 !== 'undefined') {
+                    rtn1.code1 = code1;
+                    this.source.hiddenHandle(rtn1);//隐藏关联的
+                  }
+                  if (typeof rtn1.code2 !== 'undefined') {
+                    rtn1.code2 = code2;
+                  }
+                }
+              },
+              clearMedia(id) {
+                var rtn1 = this.fieldsDic[id];
+                for (let i = 0; i < rtn1.fileSourceList.length; i++) {
+                  rtn1.fileSourceList[i].flagDeleted = true;
+                }
+                rtn1.fileList = [];
+              },
+              setTabsSelect(id) {
+                if (this.form && this.form.$vue) {
+                  var f = this.fieldsDic[id];
+                  if (this.form.isHorizontalLayout) {
+                    this.form.$vue.activeName = f.collapseName.toString() === '-1' ? this.form.$vue.activeName : f.collapseName.toString();
+                  }
+                }
+              },
+              //路由提交
+              submit(fieldName1) {
+                if (this.form && this.form.$vue) {
+                  this.form.$vue.fieldClickHandler({ fieldName1: fieldName1 });
+                }
+              },
+        
+              //获取列表数据
+              get excuteListData() {
+                if (this._excuteListData) {
+                  return this._excuteListData;
+                }
+                else {
+                  if (this.excuteData !== null) {
+                    this._excuteListData = this.excuteData.filter((v) => {
+                      return typeof v.is !== undefined && (v.is === 'ct-formlist' || v.is === 'ct-repeat');
+                    });
+                  }
+                }
+                return this._excuteListData;
+              },
+              setExcuteListData(fields) {
+                this._excuteListData = null;
+                if (fields !== null) {
+                  this.excuteData = fields;
+                  this._excuteListData = fields.filter((v) => {
+                    return typeof v.is !== undefined && (v.is === 'ct-formlist' || v.is === 'ct-repeat');
+                  });
+                }
+              },
+              //获取列表的Field
+              getListField(tableName, rowNum, fiedlId) {
+                let listData = this.excuteListData.find((v) => {
+                  return v.name === tableName;
+                });
+                if (listData) {
+                  let field = null;
+                  //正在编辑的Field
+                  if (rowNum === null && (fiedlId === null || listData.currentEventField.fieldName1 === fiedlId)) {
+                    field = listData.currentEventField;
+                  }
+                  //正在编辑的行
+                  else if (rowNum === null && listData.currentRowIndex === 0) {
+                    let fields = listData.currentRow.data;
+                    field = fields[fiedlId];
+                  }
+                  //源数据
+                  else {
+                    if (rowNum === null && listData.currentRowIndex) {
+                      rowNum = listData.currentRowIndex;
+                    }
+        
+                    if (rowNum === 0 || (rowNum && fiedlId)) {
+                      try {
+                        let fields = listData.rows[rowNum].field;
+                        field = fields.find((v) => {
+                          return v.fieldName1 === fiedlId;
+                        });
+                      } catch (e) {
+                        if (listData.rows.length <= rowNum) {
+                          common.message('获取列表行索引超出界限', 'error')
+                        }
+                      }
+                    }
+                  }
+        
+                  return { listData: listData, field: field };
+                }
+              },
+              //获取列表的行数（注意 这里包括列头）
+              getListCount(tableName) {
+                tableName = tableName ? tableName : this.form.scripts.$fd;
+                let data = this.getListField(tableName, null, null);
+                if (data) {
+                  return data.listData.rows.length;
+                }
+              },
+              //获取表格某行某列的值
+              getListFieldValue(tableName, rowNum, fiedlId, attrName, defaultValue) {
+                tableName = tableName ? tableName : this.form.scripts.$fd;
+                let data = this.getListField(tableName, rowNum, fiedlId);
+        
+                attrName = common.initialsToLowerCase(attrName);
+                attrName = attrName ? attrName : 'code1';
+        
+                if (!fiedlId) {
+                  fiedlId = data.listData.currentEventField.fieldName1;
+                }
+                if (fiedlId && rowNum === null && fiedlId === data.listData.currentEventField.fieldName1) {
+                  data.field = data.listData.currentEventField;
+                }
+                rowNum = rowNum !== null ? rowNum : data.listData.currentRowIndex;
+        
+                //若该行正在编辑，则取编辑状态的。
+                if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
+                  && data.listData.currentRow.data.$sourceIndex === rowNum && data.listData.currentRow.isSet) {
+                  return data.listData.currentRow.data[fiedlId][attrName];
+                }
+                else if (data && data.field) {
+                  if (typeof defaultValue !== 'undefined' && data.listData.rows[rowNum].deleted) {//若该行被删除时，则直接返回默认值
+                    return defaultValue;
+                  }
+                  return data.field[attrName];
+                }
+              },
+              //设置表格某行某列的值
+              setListFieldValue(value, tableName, rowNum, fiedlId, attrName, flagTemplate) {
+                value = value == undefined ? "" : value.toString();
+                tableName = tableName ? tableName : this.form.scripts.$fd;
+                let data = this.getListField(tableName, rowNum, fiedlId);
+        
+                attrName = common.initialsToLowerCase(attrName);
+                attrName = attrName ? attrName : 'code1';
+        
+                if (!fiedlId) {
+                  fiedlId = data.listData.currentEventField.id;
+                }
+        
+                rowNum = rowNum ? rowNum : data.listData.currentRowIndex;
+        
+                if (data) {
+                  //正在编辑的行
+                  if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && rowNum > -1
+                    && data.listData.currentRow.data.$sourceIndex === data.listData.source.rows[rowNum].$sourceIndex) {
+                    let currentField = data.listData.currentRow.data[fiedlId];
+                    currentField[attrName] = value;
+                    //校验自己
+                    if (currentField.validExcute) {
+                      currentField.validExcute();
+                    }
+                    if (data.field) {
+                      data.field[attrName] = value;
+                    }
+                  }
+                  else if (data.field) {
+                    if (data.field) {
+                      data.field[attrName] = value;
+                    }
+                    if (data.field.source) {
+                      data.field.source[attrName] = value;
+                    }
+                    if (flagTemplate) {
+                      data.field[attrName] = value;
+                    }
+                    if (data.listData.flagTemplate && data.listData.$vue) {
+                      data.listData.$vue.itemKey = Math.random()
+                    }
+                  }
+        
+                  //如果有汇总列，触发重新计算汇总
+                  if (data.listData.showSummary) {
+                    data.listData.tableData.push({});
+                    data.listData.tableData.pop();
+                  }
+        
+                  return true;
+                }
+                return false;
+              },
+              //设置表格选择路由
+              setListSelectRouter(tableId, attrKey, attrValue) {
+                let listData = this.excuteListData.find((v) => {
+                  return v.fieldName1 === tableId;
+                });
+                if (listData) {
+                  var router = listData.selectRouter;
+                  if (router) {
+                    router[attrKey] = attrValue;
+                  }
+                }
+              },
+              //设置表格属性值
+              setListAttr(tableId, attrName, attrValue) {
+                let listData = this.excuteListData.find((v) => {
+                  return v.fieldName1 === tableId;
+                });
+                if (listData) {
+                  listData[attrName] = attrValue
+                }
+              },
+              //新增表格数据
+              insertRow(tableId, rows) {
+                let listData = this.excuteListData.find((v) => {
+                  return v.fieldName1 === tableId;
+                });
+                if (listData) {
+                  listData.$vue.insertRow(rows);
+                }
+              },
+              //添加单选表格数据
+              insertSingleRow(tableId, row) {
+                let listData = this.excuteListData.find((v) => {
+                  return v.fieldName1 === tableId;
+                });
+                if (listData) {
+                  listData.$vue.insertSingleRow(row);
+                }
+              },
+              //新增或替换表格数据
+              insertOrUpdateRow(tableId, row) {
+                let listData = this.excuteListData.find((v) => {
+                  return v.fieldName1 === tableId;
+                });
+                if (listData) {
+                  listData.$vue.insertOrUpdateRow(row);
+                }
+              },
+              //删除表格数据
+              deleteRow(tableId, row) {
+                let listData = this.excuteListData.find((v) => {
+                  return v.id === tableId;
+                });
+                if (listData) {
+                  listData.$vue.delRow(row);
+                }
+              },
+              //清空表格数据
+              clear(tableId) {
+                let listData = this.excuteListData.find((v) => {
+                  return v.fieldName1 === tableId;
+                });
+                if (listData) {
+                  listData.$vue.deleteAll();
+                }
+              },
+        
+              //获取后台数据，并返回脚本。
+              execServerScript(action, object, successCallback) {
+                let formData = this;//作用域保存
+        
+                //是否是行内触发的
+                let data = this.getListField(this.form.scripts.$fd, null, null);
+                object.editMode = data ? 1 : 0;
+        
+                request.postHandler(common.globalUri(), { action: action, para: object }).then(
+                  function (response) {
+                    if (response.rtnCode === Enum.ReturnCode.Successful) {
+                      var data = response.content;
+                      if (response.clientActionType === Enum.ClientActionType.ExcuteScript && data) {
+                        common.excute.call(formData.form.scripts, data);
+                      }
+                      else
+                        if (response.clientActionType === Enum.ClientActionType.None && data && successCallback) {
+                          //因为要传参，并直接执行方法，故successCallback回调里要使用formData的话，要加this
+                          //若不能接受this，也可修改common.excute方法
+                          //successCallback.call(formData.form.scripts, data);
+        
+                          //优化，不需要加this
+                          common.excuteFun.call(formData.form.scripts, successCallback, data);
+                        }
+                    }
+                  }
+                );
+              },
+              execRouter(routerKey) {
+                let field = { fieldName1: routerKey };
+                this.form.$vue.fieldClickHandler(field);
+              },
+              //消息提示 type主题:success/warning/info/error。 duration 显示时间, 毫秒。设为 0 则不会自动关闭。 showClose 是否显示关闭按钮。
+              message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {
+                common.message(message, type, center, duration, showClose, dangerouslyUseHTMLString)
+              },
+        },
         get title() {
             return source.title;
         },

package/src/loader/src/SearchTable.js

@@ -208,6 +208,9 @@ function loadSearchTableModel(source, searchModel, defaultSearchData, action, se
                 else if (rtn.sortString) {
                     return rtn.sortString;
                 }
+                else if (source.page.orderBy) {
+                    return source.page.orderBy;
+                }
             },
             get pageIndex() {
                 return rtn.pageIndex;
@@ -742,7 +745,6 @@ function apiData(model, callback) {
     }
     model.isLoading = true;
     var newSearchModel = model.getSearchData();
-
     request.postHandler(common.globalUri(), {
         action: model.searchAction,
         para: {

package/src/main.js

@@ -30,7 +30,7 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.111:38028/",
 
     flagRouterSelf: true,
-    flagApp: true,//是否app端
+    flagApp: false,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
     showRequestErrorMessage: false,
@@ -68,7 +68,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:"1-bce18a8d-21f0-4022-a6ca-450de105cafc"}',
-                authObject: '{EmpID:"Token_35daf643-69e6-4da4-addf-c6c9ffdf59ff",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_35daf643-69e6-4da4-addf-c6c9ffdf59ff",Platform:"IOS"}',
+                authObject: '{EmpID:"Token_cf665522-aa5a-478c-b33a-0eac9ea30cee",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_cf665522-aa5a-478c-b33a-0eac9ea30cee",Platform:"WEB"}',
             };
         },
         getToken() {

package/src/utils/Enum.js

@@ -348,6 +348,11 @@ const Enum = {
     /// 
     /// </summary>
     Data: 4,
+
+    /// <summary>
+    /// 
+    /// </summary>
+    Url: 5,
   },
 
   /// <summary>

package/src/views/SearchList.vue

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