centaline-data-driven 1.3.21 → 1.3.24

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailOFI.vue

@@ -101,31 +101,23 @@
                 />
                 <div class="info-row mb20 mt5">
                   <div class="row-i">
-                    <span>{{ model.fields1Dic.Price.label }}</span
-                    ><span
-                      class="base-clolr expand-f"
-                      v-html="model.fields1Dic.Price.value"
-                    ></span
-                    ><span class="base-clolr">{{
-                      model.fields1Dic.Price.unitName
-                    }}</span>
-                    <img src="../../../assets/jsq.png" class="img-jsq" alt="" />
+                    <span>{{ model.fields1Dic.Price.label }}</span>
+                    <span class="base-clolr expand-f" v-html="model.fields1Dic.Price.value"></span>
+                    <span class="base-clolr">{{model.fields1Dic.Price.unitName}}</span>                    
+                    <component v-if="model.actionRouterPrice" class="ml10" style="display: flex;"
+                      :is="model.actionRouterPrice.is" :vmodel="model.actionRouterPrice" :api="model.optionApi" 
+                      @click="fieldClickHandler(model.actionRouterPrice, $event)">
+                    </component>
                   </div>
                   <div class="row-i">
-                    <span>{{ model.fields1Dic.PriceUnit.label }}</span
-                    ><span
-                      class="base-clolr expand-f"
-                      v-html="model.fields1Dic.PriceUnit.value"
-                    ></span
-                    ><span class="base-clolr">{{
-                      model.fields1Dic.PriceUnit.unitName
-                    }}</span>
+                    <span>{{ model.fields1Dic.PriceUnit.label }}</span>
+                    <span class="base-clolr expand-f" v-html="model.fields1Dic.PriceUnit.value"></span>
+                    <span class="base-clolr">{{model.fields1Dic.PriceUnit.unitName}}</span>
                   </div>
                   <div v-if="model.fields1Dic.PriceLine" class="row-i">
                     <span>{{ model.fields1Dic.PriceLine.label }}</span>
                     <div>
-                      {{ model.fields1Dic.PriceLine.value
-                      }}{{ model.fields1Dic.PriceLine.unitName }}
+                      {{ model.fields1Dic.PriceLine.value}}{{ model.fields1Dic.PriceLine.unitName }}
                     </div>
                   </div>
                 </div>
@@ -691,14 +683,9 @@ export default {
       var self = this;
       var callBack = null;
       let submitData = {};
-      var router = this.model.actionRouters.find((v) => {
+      var router = this.model.actionRoutersAll.find((v) => {
         return v.id === field.id;
       });
-      if (router == undefined && this.model.actionRoutersMoreList) {
-        router = this.model.actionRoutersMoreList.find((v) => {
-          return v.id === field.id;
-        });
-      }
       if (router == undefined && this.model.otherTradeActionRouter) {
         if (field.id === this.model.otherTradeActionRouter.id) {
           router = this.model.otherTradeActionRouter;

package/src/centaline/dynamicDetail/src/dynamicPropertyDetailRET.vue

@@ -19,16 +19,9 @@
             <img :src="model.fields1Dic.LocationUrl.value" alt="" class="location"/>
           </div>
           <div class="title-tags">
-            <div
-              class="t-tag"
-              v-for="(tag, index) in model.actionRouterLabel"
-              :key="index"
-              :style="{
-                color: tag.textColor,
-                backgroundColor: tag.bgColor,
-                borderColor: tag.borderColor,
-              }"
-            >
+            <div class="t-tag"
+              v-for="(tag, index) in model.actionRouterLabel"  :key="index"
+              :style="{ color: tag.textColor, backgroundColor: tag.bgColor,borderColor: tag.borderColor,}">
               {{ tag.label }}
             </div>
           </div>
@@ -38,49 +31,21 @@
         </div>
         <div class="head-but">
           <div>
-            <component
-              v-if="model.otherTradeActionRouter !== null"
-              v-bind="model.otherTradeActionRouter"
-              class="max-default w93"
-              :is="model.otherTradeActionRouter.is"
-              :vmodel="model.otherTradeActionRouter"
-              :api="model.optionApi"
-              @click="fieldClickHandler(model.otherTradeActionRouter, $event)"
-            ></component>
-            <img
-              :class="{ domDisabled: flagDisabledPrev }"
-              @click="clickPrevHandler"
-              src="../../../assets/T.png"
-              alt=""
-              style="
-                width: 26px;
-                height: 26px;
-                vertical-align: bottom;
-                margin-left: 20px;
-                cursor: pointer;
-              "
-            />
-            <img
-              :class="{ domDisabled: flagDisabledNext }"
-              @click="clickNextHandler"
-              src="../../../assets/B.png"
-              alt=""
-              style="
-                width: 26px;
-                height: 26px;
-                vertical-align: bottom;
-                margin-left: 15px;
-                margin-right: 13px;
-                cursor: pointer;
-              "
-            />
+            <component v-if="model.otherTradeActionRouter !== null" v-bind="model.otherTradeActionRouter" class="max-default w93"
+              :is="model.otherTradeActionRouter.is" :vmodel="model.otherTradeActionRouter" :api="model.optionApi"
+              @click="fieldClickHandler(model.otherTradeActionRouter, $event)">
+            </component>
+            <img :class="{ domDisabled: flagDisabledPrev }" @click="clickPrevHandler"
+              src="../../../assets/T.png" alt=""
+              style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 20px;cursor: pointer;"/>
+            <img :class="{ domDisabled: flagDisabledNext }" @click="clickNextHandler"
+              src="../../../assets/B.png" alt=""
+              style=" width: 26px; height: 26px;vertical-align: bottom; margin-left: 15px; margin-right: 13px; cursor: pointer;"/>
           </div>
           <div class="mt5">
             <component
               class="max-report w93"
-              v-if="
-                model.actionRouters !== null && model.actionRouters[0] !== null
-              "
+              v-if=" model.actionRouters !== null && model.actionRouters[0] !== null"
               :is="model.actionRouters[0].is"
               :vmodel="model.actionRouters[0]"
               :api="model.optionApi"
@@ -98,26 +63,14 @@
             ></component>
           </div>
           <div class="mt5">
-            <button
-              type="button"
-              class="
-                el-button el-button--info el-button--mini
-                max-report
-                rel
-                w93
-              "
-              v-if="
-                model.actionRoutersMoreList !== null &&
-                model.actionRoutersMoreList.length > 0
-              "
-            >
+            <button type="button"
+              class="el-button el-button--info el-button--mini max-report rel w93"
+              v-if=" model.actionRoutersMoreList !== null && model.actionRoutersMoreList.length > 0">
               <img src="../../../assets/dian.png" alt="" class="report" />
               <ul class="report-cont">
-                <li
-                  v-for="(col, index) in model.actionRoutersMoreList"
+                <li v-for="(col, index) in model.actionRoutersMoreList"
                   :key="index"
-                  v-if="col.show !== false"
-                >
+                  v-if="col.show !== false">
                   <component
                     class="max-report w93"
                     :is="col.is"
@@ -129,9 +82,7 @@
               </ul>
             </button>
             <component
-              v-else-if="
-                model.actionRouters !== null && model.actionRouters.length === 3
-              "
+              v-else-if=" model.actionRouters !== null && model.actionRouters.length === 3 "
               class="max-report w93"
               :is="model.actionRouters[2].is"
               :vmodel="model.actionRouters[2]"
@@ -158,7 +109,10 @@
                     <span>{{ model.fields1Dic.Price.label }}</span>
                     <span class="base-clolr expand-f" v-html="model.fields1Dic.Price.value"></span>
                     <span class="base-clolr">{{ model.fields1Dic.Price.unitName}}</span>
-                    <img src="../../../assets/jsq.png" class="img-jsq" alt="" />
+                    <component v-if="model.actionRouterPrice" class="ml10" style="display: flex;"
+                      :is="model.actionRouterPrice.is" :vmodel="model.actionRouterPrice" :api="model.optionApi" 
+                      @click="fieldClickHandler(model.actionRouterPrice, $event)">
+                    </component>
                   </div>
                   <div class="row-i">
                     <span>{{ model.fields1Dic.PriceUnit.label }}</span>
@@ -242,17 +196,8 @@
               <div style="position: relative">
                 <div ref="tabsbox" style="position: absolute; left: -10000px">
                   <el-tabs>
-                    <el-tab-pane
-                      v-for="(col, index) in model.tags1"
-                      :key="col.appID"
-                      :index="index.toString()"
-                      :name="index.toString()"
-                    >
-                      <div
-                        slot="label"
-                        v-html="col.appName"
-                        :ref="'StatisticsItem' + index"
-                      ></div>
+                    <el-tab-pane v-for="(col, index) in model.tags1" :key="col.appID" :index="index.toString()" :name="index.toString()">
+                      <div slot="label" v-html="col.appName" :ref="'StatisticsItem' + index"></div>
                     </el-tab-pane>
                   </el-tabs>
                 </div>
@@ -869,14 +814,9 @@ export default {
       var self = this;
       var callBack = null;
       let submitData = {};
-      var router = this.model.actionRouters.find((v) => {
+      var router = this.model.actionRoutersAll.find((v) => {
         return v.id === field.id;
       });
-      if (router == undefined && this.model.actionRoutersMoreList) {
-        router = this.model.actionRoutersMoreList.find((v) => {
-          return v.id === field.id;
-        });
-      }
       if (router == undefined && this.model.otherTradeActionRouter) {
         if (field.id === this.model.otherTradeActionRouter.id) {
           router = this.model.otherTradeActionRouter;
@@ -1007,9 +947,7 @@ export default {
           else if (field.isSearchPageInTab) {
             // 外部框架tab页打开
             submitData = field.getActionPara(submitData).para;
-            self.$common
-              .getDataDrivenOpts()
-              .handler.openTabSearch(field, submitData);
+            self.$common.getDataDrivenOpts().handler.openTabSearch(field, submitData);
           } 
           else if (field.isBrowserNewTab) {
             // 浏览器打开

package/src/centaline/dynamicDragSort/index.js

@@ -0,0 +1,19 @@
+/*
+ * @Author: linchunmei 179466780@qq.com
+ * @Date: 2022-07-07 11:00:16
+ * @LastEditors: linchunmei 179466780@qq.com
+ * @LastEditTime: 2022-07-07 11:01:26
+ * @FilePath: \js-sdk-v3\src\centaline\dynamicDragSort\index.js
+ * @Description: 排序拖拽组件
+ */
+import dynamicDragSort from './src/dynamicDragSort'
+
+dynamicDragSort.install = function (Vue) {
+  Vue.component(dynamicDragSort.name, dynamicDragSort);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicDragSort);
+}
+
+export default dynamicDragSort;

package/src/centaline/dynamicDragSort/src/dynamicDragSort.vue

@@ -0,0 +1,197 @@
+<template>
+    <!--使用draggable组件-->
+    <div class="dragCol">
+        <div class="dragItem">
+            <el-checkbox id="all" v-model="checkAll" @change="handleAllChecked" class="checkbox-common">{{ controlLabel
+            }}
+            </el-checkbox>
+            <span class="svgIcon">
+                <!-- <svg-icon icon-class="sort" style="cursor: pointer"></svg-icon> -->
+            </span>
+        </div>
+        <draggable v-model="testList" :options="{ group: { name: 'itxst', pull: 'clone' }, sort: true }" animation="300"
+            :move="onMove" dragClass="dragClass" ghostClass="ghostClass" chosenClass="chosenClass"
+            @input="handleListChange($event)">
+            <transition-group>
+                <div class="dragItem canDragon" v-for="(item, index) in testList" :key="index">
+                    <el-checkbox v-model="item.checked" :disabled="item.locked" name="checkItem"
+                        @change="handleChecked(item, $event)" class="checkbox-common"> {{ item.displayName
+                        }}</el-checkbox>
+                    <span class="svgIcon">
+                        <img :src="iconSort" alt="" width="100%" />
+                    </span>
+                </div>
+            </transition-group>
+        </draggable>
+    </div>
+</template>
+
+<script>
+//导入draggable组件
+import draggable from 'vuedraggable'
+
+export default {
+    //注册draggable组件
+    name: 'ct-dragSort',
+    components: {
+        draggable,
+    },
+    props: {
+        vmodel: Object,
+        api: String,
+    },
+    data() {
+        return {
+            iconSort: require("../../../assets/sort.png"),
+            drag: false,
+            checkAll: true,
+            controlLabel: '列名',
+            //定义要被拖拽对象的数组
+            testList: [],
+        };
+    },
+    watch: {
+        testList: { // 监听事件,监听复选框是否全部选中,全部选中则全选的复选框勾选上
+            handler(val) {
+                var i = 0
+                this.testList.forEach(item => {
+                    if (item.checked === true) {
+                        i++
+                    }
+                    if (i === this.testList.length) {
+                        this.checkAll = true
+                    } else {
+                        this.checkAll = false
+                    }
+                })
+            },
+            deep: true
+        }
+    },
+    created() {
+        console.log('draglist', this.vmodel.dragList);
+        this.$nextTick(function () {
+            if (typeof this.vmodel === 'undefined') {
+                this.model = this.loaderObj.DragSort(this.source);
+            }
+            else {
+                this.model = this.vmodel;
+                this.testList = this.vmodel.dragList;
+                console.log('this.testList', this.testList);
+            }
+        });
+
+        this.testList.forEach(item => { // 处理后端传过来的数据,如果没有可以判断是否勾选复选框的字段,则需给数据作处理,加上一个isChecked字段,判断复选框勾选
+            this.$set(item, 'checked', false) // 添加判断的字段
+        })
+    },
+    methods: {
+        // 更新位置
+        handleListChange(event) {
+            console.log(event);
+            this.testList = event;
+
+            this.testList.forEach((item, i) => {
+                this.model.dragList.splice(i, 1, item)
+            })
+
+            console.log('handleListChange-testList', this.testList);
+            console.log('this.model.code1', this.model.code1);
+        },
+        //move回调方法
+        onMove(e, originalEvent) {
+        },
+        //开始拖拽事件
+        onStart() {
+            this.drag = true;
+        },
+        //拖拽结束事件
+        onEnd() {
+            this.drag = false;
+            // this.handleListChange()
+        },
+        handleAllChecked(v) { // 实现全选，反选(点击会传递true或者false过来)
+            this.testList.map(item => {
+                if (!item.locked) {
+                    item.checked = v
+                } else {
+                    return false
+                }
+            })
+            this.vmodel.draglist = this.testList
+            console.log('this.vmodel.draglist', this.vmodel.dragList);
+        },
+        handleChecked(item, e) { // 单个选中
+            item.checked = e
+            console.log('this.testList', this.testList);
+            this.vmodel.draglist = this.testList
+            console.log('this.vmodel.draglist', this.vmodel.dragList);
+        }
+    }
+}
+</script>
+<style  scoped>
+/*定义要拖拽元素的样式*/
+.ghostClass {
+    background-color: #fff !important;
+}
+
+.chosenClass {
+    background-color: #ccc !important;
+    opacity: 1 !important;
+}
+
+/* 拖拽过程 */
+.dragClass {
+    background-color: #fff !important;
+    opacity: 1 !important;
+    box-shadow: none !important;
+    outline: none !important;
+    background-image: none !important;
+}
+
+.dragCol {
+    width: 100%;
+    flex: 1;
+    border-radius: 5px;
+    float: left;
+}
+
+.dragCol+.dragCol {
+    margin-left: 10px;
+}
+
+.dragItem {
+    width: auto;
+    padding: 12px 10px;
+    margin: 0 -5px;
+    border-bottom: solid 1px #eee;
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: space-between;
+}
+
+.dragItem:hover {
+    background-color: #F5F7FA;
+    cursor: move;
+}
+
+.dragItem+.dragItem {
+    border-top: none;
+}
+
+#all {
+    color: #909399;
+    font-weight: 700;
+}
+
+.svgIcon {
+    width: 16px;
+    text-align: center;
+    cursor: pointer
+}
+
+/* .checkbox-common>>>span.el-checkbox__label {
+    padding-left: 30px;
+} */
+</style>

package/src/centaline/dynamicForm/src/dynamicFormListTable.vue

@@ -28,7 +28,7 @@
                     @input="inputHandler(model.currentRow.data[v.id], model.currentRow.data.$sourceIndex)"></component>
                 </span>
                 <span v-else-if="v.is=='ct-sensitiveeye'">
-                  <component v-if ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
+                  <component ref="Fields" :is="v.is" :vmodel="scope.row[v.id]" :vrowmodel="scope.row" :api="model.OptApi"></component>
                 </span>
                 <!--可点击的列-->
                 <span v-else-if="v.router" :class="'cell'" style="display: flex;">

package/src/centaline/dynamicL/src/dynamicL.vue

@@ -26,6 +26,7 @@
           {{model.labelValue}}
         </label>
         <span slot="suffix" v-if="model.unitName" class="ct-unitnameLable">{{model.unitName}}</span>
+        <span v-if="model.sufLabel" style="width:auto" class="spanMessage">{{model.sufLabel}}</span>
       </div>
     </div>
   </div>

package/src/centaline/dynamicLayout/src/dynamicLayoutLabel.vue

@@ -17,6 +17,7 @@
     mixins: [dynamicElement],
     props: {
       vmodel: Object,
+      rowdata: Object,
       actionRouter: Array,
       rowindex: Number,
       forname: String,

package/src/centaline/dynamicLayout/src/dynamicLayoutLine.vue

@@ -9,8 +9,10 @@
     mixins: [dynamicElement],
     props: {
       vmodel: Object,
+      rowdata: Object,
+      actionRouter: Array,
       rowindex: Number,
-       forname: String,
+      forname: String,
       forrowindex: String
     },
     data() {

package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue

@@ -277,20 +277,20 @@ export default {
           if (rtn) {
             self.$forceUpdate();
             self.$nextTick(() => {
-              if (
-                self.$refs.tableParent.scrollHeight <=
-                self.$refs.tableParent.offsetHeight
-              ) {
-                self.tableLoading = true;
-                self.model.nextPage(next);
-              } else {
-                self.tableLoading = false;
-                self.rowColorChange();
-
-                self.calculatingRowHeight();
+              if(!self.isLayout){
+                if (self.$refs.tableParent.scrollHeight <= self.$refs.tableParent.offsetHeight) {
+                  self.tableLoading = true;
+                  self.model.nextPage(next);
+                } 
+                else {
+                  self.tableLoading = false;
+                  self.rowColorChange();
+                  self.calculatingRowHeight();
+                }
               }
             });
-          } else {
+          } 
+          else {
             self.tableLoading = false;
           }
         };
@@ -569,34 +569,24 @@ export default {
     setTableHeight() {
       var self = this;
       this.$nextTick(() => {
-        if (
-          this.$refs.searchTable &&
-          this.$refs.toolbar &&
-          this.$refs.searchTable.parentElement &&
-          !self.isLayout
-        ) {
+        if (this.$refs.searchTable && this.$refs.toolbar &&
+          this.$refs.searchTable.parentElement &&!self.isLayout) {
           var h1 = this.$refs.searchTable.parentElement.offsetHeight | 0;
           var h2 = this.$refs.searchTable.offsetTop | 0;
           var h3 = this.$refs.toolbar.$el.offsetHeight | 0;
           var h4 = this.$refs.footer.$el.offsetHeight | 0;
           var h5 = this.$refs.listHeader.$el.offsetHeight | 0;
           var h6 = this.$refs.listFooter.$el.offsetHeight | 0;
-          var h7 = this.$refs.tableStats
-            ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0
-            : 0;
+          var h7 = this.$refs.tableStats ? (this.$refs.tableStats.$el.offsetHeight + 7) | 0: 0;
           let tableHeight = h1 - h2 - h3 - h4 - h5 - h6 - h7 - 22;
           this.model.tableHeight = tableHeight < 40 ? 350 : tableHeight;
           this.$nextTick(() => {
             self.getScrollAttr();
           });
-        } else {
-          if (
-            this.$parent.$parent.$vnode.componentOptions.tag ===
-            "ct-PropertySimpleDetailRET"
-          ) {
-            var h1 =
-              this.$parent.$parent.$parent.$parent.$refs.sidebar.offsetHeight |
-              0;
+        } 
+        else {
+          if (this.$parent.$parent.$vnode.componentOptions.tag === "ct-PropertySimpleDetailRET") {
+            var h1 = this.$parent.$parent.$parent.$parent.$refs.sidebar.offsetHeight | 0;
             var h2 = 0;
             if (this.$parent.$parent.$refs.contact) {
               h2 = this.$parent.$parent.$refs.contact.offsetHeight | 0;

package/src/centaline/loader/src/ctl/Base.js

@@ -59,7 +59,7 @@ const Base = function (source) {
       source.code2 = v;
     },
     get labelValue() {
-      if (source.code1)
+      if (source.code1!=undefined && source.code1!=null)
         return source.code1;
       else
         return '';