doway-coms 1.3.3 → 1.3.5

package/packages/BaseGantt/src/index.vue

@@ -99,12 +99,14 @@
         isCurrent: isCurrent,
         isHover: true
       }"
+        :treeConfig="treeConfig"
         :cell-class-name="cellClassName"
         :row-class-name="rowClassName"
         @cell-click="cellClick"
         @scroll="bodyScroll"
         :loading="loading"
         @filter-change="filterChangeEvent"
+        @toggle-tree-expand="toggleTreeExpand"
     >
       <template #content="{ row, rowIndex }">
         <div>
@@ -143,6 +145,7 @@ import { Space, Radio } from "ant-design-vue";
 import XEUtils from 'xe-utils'
 import moment from 'moment'
 import draggable from 'vuedraggable'
+import resizeDetector from 'element-resize-detector';
 export default {
   name: "BaseGantt",
   components: {
@@ -211,6 +214,12 @@ export default {
     rowClassName: {
       type: Function,
       default: function() {}
+    },
+    treeConfig:{
+      type: Object,
+      default: function() {
+        return null
+      }
     }
   },
   computed: {
@@ -219,10 +228,20 @@ export default {
     }
   },
   mounted() {
+
+    let erd = resizeDetector();
+    let gridBodyDiv = this.$refs.bodyGrid.$el.getElementsByClassName('vxe-table--body')[0]
+    let vm  = this
+    erd.listenTo(gridBodyDiv, () => {
+             vm.lineHeight = gridBodyDiv.clientHeight
+    });
     this.timeViewValue = this.timeValue
   },
   created() {},
   methods: {
+    toggleTreeExpand(scope){
+        // console.debug(this.$refs.bodyGrid.$el.getElementsByClassName('vxe-table--body')[0].clientHeight)
+    },
     filterChangeEvent({ column }) {},
     //   headerDayCellStyle({ column, columnIndex }){
     //       return {
@@ -265,6 +284,9 @@ export default {
           // filters:[{data:null}],
           // filterRender:{name: 'input'}
         }
+        if(this.leftCols[i].treeNode===true){
+          obj['treeNode'] = true
+        }
 
         if (this.leftCols[i].slots) {
           obj.slots = this.leftCols[i].slots

package/packages/BasePictureCard/src/index.vue

@@ -118,6 +118,8 @@
       show-zoom
       transfer
       resize
+      :height="550"
+      :width="800"
       destroy-on-close
       :fullscreen="isFullscreen || dialogViewType == 'application/pdf'"
       :z-index="999"

package/packages/BaseTime/src/index.vue

@@ -1,131 +1,134 @@
 <template>
-    <div class="d-control-container">
-      <div class="d-control-label">
-        {{ label
-        }}
-        <span v-if="rules && rules['required']" class="d-control-label-required"
+  <div class="d-control-container">
+    <div class="d-control-label">
+      {{ label }}
+      <span v-if="rules && rules['required']" class="d-control-label-required"
         >*</span
-        >
-        <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-          <img src="../../styles/icon/help.png" alt="" style="width: 14px">
-        </Tooltip>
-      </div>
-      <div class="d-control">
-        <ValidationProvider
-          :name="label"
-          v-slot="v"
-          :rules="rules"
-          v-if="edit === true"
-        >
-          <TimePicker
-            :size="'small'"
-            placeholder="选择时间"
-            v-model="currentValue"
-            format="HH:mm:ss"
-            value-format="HH:mm:ss"
-            style="width: 100%"
-            :class="{ 'd-error-input': v.errors.length > 0 }"
-          />
-          <div class="d-error-msg">
-            {{ v.errors[0] }}
-          </div>
-        </ValidationProvider>
-        <span v-else>{{ currentValue }}</span>
-      </div>
+      >
+      <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
+        <img src="../../styles/icon/help.png" alt="" style="width: 14px" />
+      </Tooltip>
     </div>
-  </template>
+    <div class="d-control">
+      <ValidationProvider
+        :name="label"
+        v-slot="v"
+        :rules="rules"
+        v-if="edit === true"
+      >
+        <TimePicker
+          :size="'small'"
+          placeholder="选择时间"
+          v-model="currentValue"
+          format="HH:mm:ss"
+          value-format="HH:mm:ss"
+          style="width: 100%"
+          :class="{ 'd-error-input': v.errors.length > 0 }"
+          @change="change"
+        />
+        <div class="d-error-msg">
+          {{ v.errors[0] }}
+        </div>
+      </ValidationProvider>
+      <span v-else>{{ currentValue }}</span>
+    </div>
+  </div>
+</template>
   
   <script>
-  import moment from 'moment'
-  import { TimePicker } from 'ant-design-vue'
-  import { ValidationProvider } from 'vee-validate'
-  import { Tooltip } from 'ant-design-vue'
+import moment from "moment";
+import { TimePicker } from "ant-design-vue";
+import { ValidationProvider } from "vee-validate";
+import { Tooltip } from "ant-design-vue";
 
-  export default {
-    name: 'BaseTime',
-    components:{
-        TimePicker,
+export default {
+  name: "BaseTime",
+  components: {
+    TimePicker,
     ValidationProvider,
-      Tooltip,
-
+    Tooltip,
+  },
+  data() {
+    return {
+      moment,
+      filterValue: "",
+      isInputChanged: false,
+      inputTimeout: null,
+      searchRows: [],
+      filterCols: [],
+      gridLoading: false,
+      gridPagerConfig: {
+        total: 0,
+        currentPage: 1,
+        pageSize: 10,
+      },
+    };
   },
-    data() {
-      return {
-        moment,
-        filterValue: '',
-        isInputChanged: false,
-        inputTimeout: null,
-        searchRows: [],
-        filterCols: [],
-        gridLoading: false,
-        gridPagerConfig: {
-          total: 0,
-          currentPage: 1,
-          pageSize: 10
-        }
-      }
+  computed: {
+    currentValue: {
+      // 动态计算currentValue的值
+      get: function () {
+        return this.value; // 将props中的value赋值给currentValue
+      },
+      set: function (val) {
+        this.$emit("input", val); // 通过$emit触发父组件
+      },
     },
-    computed: {
-      currentValue: {
-        // 动态计算currentValue的值
-        get: function() {
-          return this.value // 将props中的value赋值给currentValue
-        },
-        set: function(val) {
-          this.$emit('input', val) // 通过$emit触发父组件
-        }
-      }
+  },
+  props: {
+    rules: {
+      type: Object,
+      default: function () {
+        return null;
+      },
     },
-    props: {
-      rules: {
-        type: Object,
-        default: function() {
-          return null
-        }
+    value: {
+      type: String,
+      default: function () {
+        return "";
       },
-      value: {
-        type: String,
-        default: function() {
-          return ''
-        }
+    },
+    edit: {
+      type: Boolean,
+      default: function () {
+        return false;
       },
-      edit: {
-        type: Boolean,
-        default: function() {
-          return false
-        }
+    },
+    name: {
+      type: String,
+      default: function () {
+        return "";
       },
-      name: {
-        type: String,
-        default: function() {
-          return ''
-        }
+    },
+    label: {
+      type: String,
+      default: function () {
+        return "";
       },
-      label: {
-        type: String,
-        default: function() {
-          return ''
-        }
+    },
+    placeholder: {
+      type: String,
+      default: function () {
+        return "";
       },
-      placeholder: {
-        type: String,
-        default: function() {
-          return ''
-        }
+    },
+    tooltip: {
+      type: String,
+      default: function () {
+        return "";
       },
-      tooltip: {
-        type: String,
-        default: function() {
-          return ''
-        }
-      }
     },
-    created() {},
-    methods: {}
-  }
-  </script>
+  },
+  created() {},
+  methods: {
+    change() {
+      this.$emit('change')
+    },
+  },
+};
+</script>
   
   <style lang="scss" scoped></style>
   <style lang="less">
-@import  '../../styles/default.less';
+@import "../../styles/default.less";
 </style>