doway-coms 1.4.37 → 1.4.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "1.4.37",
+  "version": "1.4.39",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseButton/index.js

@@ -0,0 +1,8 @@
+// 导入组件，组件必须声明 name
+import BaseButton from './src/index.vue';
+// 为组件提供 install 安装方法，供按需引入
+BaseButton.install = function(Vue) {
+    Vue.component(BaseButton.name, BaseButton);
+};
+// 默认导出组件
+export default BaseButton;

package/packages/BaseButton/src/index.vue

@@ -0,0 +1,241 @@
+<template>
+  <div class="d-control-container">
+    <div class="d-control-label">
+      {{ colInfo.title
+      }}<span
+        v-if="colInfo.rules && colInfo.rules['required']"
+        class="d-control-label-required"
+      >*
+      </span>
+    </div>
+    <div class="d-control">
+      <ValidationProvider
+        :name="colInfo.title"
+        v-slot="v"
+        :rules="colInfo.rules"
+      >
+        <span
+          v-if="
+            currentValue !== null &&
+              currentValue !== '' &&
+              currentValue !== undefined
+          "
+        >
+          {{ currentValue }}&nbsp;&nbsp;&nbsp;
+        </span>
+        <Button type="primary" :size="'small'" @click="buttonClick">{{
+          colInfo.buttonTitle
+        }}</Button>
+        <div class="d-error-msg">
+          {{ v.errors[0] }}
+        </div>
+        <!-- 弹出框输入,单独保存接口 -->
+        <Modal
+          v-model="visibleModal"
+          :title="colInfo.buttonTitle + '--' + colInfo.title"
+          @ok="handleOk"
+        >
+          <!-- 文本框输入 -->
+          <Input
+            v-if="
+              colInfo.controlType == 'text' ||
+                colInfo.controlType == null ||
+                colInfo.controlType == undefined
+            "
+            :size="'small'"
+            v-model="showValue"
+            placeholder="请输入需保存的值"
+            style="width: 100%"
+            :class="{ 'd-error-input': v.errors.length > 0 }"
+          />
+          <!-- 文本框输入控件 -->
+          <BaseTextArea
+            v-if="colInfo.controlType === 'textarea'"
+            :label="colInfo.title"
+            v-model="currentValue"
+            :edit="true"
+            :rules="colInfo.rules"
+          />
+          <!-- 日期选择控件 -->
+          <BaseDate
+            v-if="colInfo.controlType === 'date'"
+            :label="colInfo.title"
+            v-model="currentValue"
+            :pastDate="colInfo.pastDate"
+            :rules="colInfo.rules"
+            :edit="true"
+          />
+          <!-- 日期时间控件 -->
+          <BaseDatetime
+            v-if="colInfo.controlType === 'datetime'"
+            :label="colInfo.title"
+            v-model="currentValue"
+            :pastDate="colInfo.pastDate"
+            :rules="colInfo.rules"
+            :edit="true"
+          />
+          <!-- 时间选择控件 -->
+          <BaseTime
+            v-if="colInfo.controlType === 'time'"
+            :label="colInfo.title"
+            v-model="currentValue"
+            :edit="true"
+            :rules="colInfo.rules"
+          />
+          <!-- 周数选择器 -->
+          <BaseDateWeek
+            v-if="colInfo.controlType === 'dateweek'"
+            :label="colInfo.title"
+            v-model="currentValue"
+            :edit="true"
+            :rules="colInfo.rules"
+          />
+          <!-- 数字输入 -->
+          <BaseNumberInput
+            v-if="colInfo.controlType === 'number'"
+            :label="colInfo.title"
+            v-model="currentValue"
+            :edit="true"
+            :rules="colInfo.rules"
+            :min="colInfo.min"
+            :max="colInfo.max"
+            :precision="colInfo.precision"
+          />
+          <BaseIntervalInput
+            v-if="colInfo.controlType === 'interval'"
+            :label="colInfo.title"
+            v-model="currentValue"
+            :edit="true"
+            :rules="colInfo.rules"
+            :displayType="colInfo.displayType"
+            :valueType="colInfo.valueType"
+          />
+          <!-- 单选框 -->
+          <BaseCheckbox
+            v-if="colInfo.controlType === 'checkbox'"
+            :label="colInfo.title"
+            v-model="currentValue"
+            :edit="true"
+            :rules="colInfo.rules"
+          />
+          <!-- 下拉选择器 -->
+          <BaseSelect
+            v-if="colInfo.controlType === 'select'"
+            :label="colInfo.title"
+            v-model="currentValue"
+            :edit="true"
+            :rules="colInfo.rules"
+            :dataSource="colInfo.dataSource"
+          />
+          <BaseSelectMulti
+            v-if="colInfo.controlType === 'dropmulti'"
+            :label="colInfo.title"
+            v-model="currentValue"
+            :edit="colInfo.edit"
+            :rules="colInfo.rules"
+            :dataSource="colInfo.dataSource"
+          />
+          <!-- 下拉表格容器 -->
+          <BasePulldown
+            v-if="colInfo.controlType === 'pulldown'"
+            :formRow="formRow"
+            :edit="true"
+            :defaultExpression="colInfo.defaultExpression"
+            :row="row"
+            :api="colInfo.api"
+            :optBtns="colInfo.optBtns"
+            :popupAddName="colInfo.popupAddName"
+            :popupAddPath="colInfo.popupAddPath"
+            :label="colInfo.title"
+            :rules="colInfo.rules"
+            :route="colInfo.route"
+            v-model="currentValue"
+            :field="colInfo.field"
+            :columns="colInfo.columns"
+            :pageSize="colInfo.pageSize"
+            :immediate="colInfo.immediate"
+          />
+        </Modal>
+      </ValidationProvider>
+    </div>
+  </div>
+</template>
+<script>
+import { Modal, Input, Button } from 'ant-design-vue'
+import { ValidationProvider } from 'vee-validate'
+export default {
+  name: 'BaseButton',
+  components: {
+    ValidationProvider,
+    Modal,
+    Input,
+    Button,
+  },
+  data() {
+    return {
+      showValue: '',
+      // 弹出框是否展示
+      visibleModal: false
+    }
+  },
+  computed: {
+    currentValue: {
+      // 动态计算currentValue的值
+      get: function() {
+        return this.value // 将props中的value赋值给currentValue
+      },
+      set: function(val) {
+        this.$emit('input', val) // 通过$emit触发父组件
+      }
+    }
+  },
+  props: {
+    value: {
+      type: String,
+      default: function() {
+        return ''
+      }
+    },
+    colInfo: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    },
+    row: {
+      // 当前行，如果是表单的话当前行和当前页面数据集是一样的
+      type: Object,
+      default: function() {
+        return {}
+      }
+    },
+    formRow: {
+      // 当前页面数据集
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  created() {},
+  mounted() {
+    // 将父组件的值拿来用，确认更改前不改变外部的值
+    this.showValue = this.value
+  },
+  methods: {
+    // 弹出框显示
+    buttonClick() {
+      this.visibleModal = true
+    },
+    // 确认
+    handleOk() {
+      this.$emit('handleOk', this.showValue)
+      this.$nextTick(() => {
+        this.visibleModal = false
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

package/packages/BaseForm/src/index.vue

@@ -29,7 +29,7 @@
       />
       <!-- 按钮弹出框输入控件 -->
       <!-- isButtonShow字段是额外添加字段，用于控制区分输入框控件 -->
-      <base-button
+      <BaseButton
         v-if="col.isButtonShow == true"
         v-model="row[col.field]"
         :colInfo="col"
@@ -268,6 +268,7 @@ import BaseDate from "../../BaseDate/index";
 import BaseDatetime from "../../BaseDatetime/index";
 import BaseDateWeek from "../../BaseDateWeek/index";
 import BaseTextArea from "../../BaseTextArea/index";
+import BaseButton from "../../BaseButton/index";
 import BaseSelect from "../../BaseSelect/index";
 import BaseSelectMulti from "../../BaseSelectMulti/index";
 import BaseTime from "../../BaseTime/index";
@@ -284,6 +285,7 @@ export default {
     BaseDatetime,
     BaseDateWeek,
     BaseTextArea,
+    BaseButton,
     BaseSelect,
     BaseSelectMulti,
     BaseTime,

package/packages/BaseGrid/src/index.vue

@@ -2350,7 +2350,6 @@ export default {
         };
         let expStr = "";
         let filterBindingValues = loopColInfo.filters[0].data.bindingValues;
-        debugger
         //筛选条件过滤
         let colFilterExpression = { operator: "or", expressions: [] };
 

package/packages/BasePictureCard/src/index.vue

@@ -13,10 +13,8 @@
           <div class="attach" v-if="internalRow.attach.content === 'image'">
             <img
               @click="attachFileClick(internalRow.attach)"
-              :style="{ height: height, lineHeight: height }"
+              :style="{ height: height, lineHeight: height, width: width }"
               style="
-                min-width: 100px;
-                width: 100%;
                 border: 1px solid #ccc;
                 border-radius: 6px;
                 overflow: hidden;
@@ -41,18 +39,11 @@
               type="eye"
               @click="viewAttach(internalRow.attach)"
             />
-            <!-- <VxeCheckbox
-              class="attach-circle"
-              v-model="internalRow.isDefault"
-              @change="circleAttach(internalRow.attach, internalRow)"
-              :disabled="formState == 'view'"
-            ></VxeCheckbox> -->
           </div>
           <div class="attach" v-else>
             <img
               @click="attachFileClick(internalRow.attach)"
-              class="o_image"
-              style="width: 100%"
+              :style="{ height: height, lineHeight: height, width: width }"
               :data-mimetype="internalRow.attach.contentType"
             />
             <a-icon
@@ -71,12 +62,6 @@
               type="eye"
               @click="viewAttach(internalRow.attach)"
             />
-            <!-- <VxeCheckbox
-              class="attach-circle"
-              v-model="internalRow.isDefault"
-              @change="circleAttach(internalRow.attach, internalRow)"
-              :disabled="formState == 'view'"
-            ></VxeCheckbox> -->
           </div>
           <div
             :style="{ width: width }"
@@ -125,28 +110,11 @@
       :height="550"
       :width="800"
       destroy-on-close
-      :fullscreen="isFullscreen || dialogViewType == 'application/pdf'"
+      :fullscreen="dialogViewType == 'application/pdf'"
       :z-index="999"
     >
-      <!-- 添加普通图片全屏属性控制 -->
       <template #title>
-        <div
-          v-if="dialogViewType !== 'application/pdf'"
-          style="text-align: right; margin-right: 15px; padding-top: 5px"
-        >
-          <!-- 全屏 -->
-          <i
-            v-if="!isFullscreen"
-            style="font-size: 19px; margin-right: 10px"
-            @click="screenClick"
-          ></i>
-          <!-- 取消全屏 -->
-          <i
-            v-else
-            style="font-size: 19px; margin-right: 10px"
-            @click="narrowClick"
-          ></i>
-        </div>
+        <span>{{ currentFileTitle }}</span>
       </template>
       <!-- pdf -->
       <embed
@@ -199,7 +167,7 @@ export default {
       uploadHeaders: {
         Authorization: null,
       },
-      isFullscreen: false,
+      currentFileTitle: ''
     };
   },
   props: {
@@ -457,20 +425,11 @@ export default {
         this.dialogViewType = attachFile.contentType;
         this.dialogVisible = true;
       }
+      this.currentFileTitle = attachFile.name
     },
     closePdf() {
       this.isShowPdf = false;
     },
-    // 放大
-    screenClick() {
-      this.isFullscreen = true;
-    },
-    // 局部展示
-    narrowClick() {
-      this.isFullscreen = false;
-    },
-    // 单选改变事件
-    // change
   },
 };
 </script>

package/packages/index.js

@@ -20,6 +20,7 @@ import BasePrintPreview from './BasePrintPreview/index';
 import BaseGantt from "./BaseGantt/index";
 import BaseKanbanEmpty from "./BaseKanbanEmpty/index";
 import BaseSearch from "./BaseSearch/index";
+import BaseButton from "./BaseButton/index";
 
 import store from './utils/store'
 import request from './utils/request'
@@ -31,7 +32,7 @@ const components = [
 	BaseTextArea, BaseSelect, BaseSelectMulti, BaseTime, BasePagination,
 	BaseNumberInput, BaseTool, BaseToolStatus, BasePulldown, BaseIntervalInput,
 	BaseForm, BasePictureCard, BaseGrid, BasePrintPreview, BaseGantt,
-	BaseKanbanEmpty, BaseSearch
+	BaseKanbanEmpty, BaseSearch, BaseButton
 ];
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
 
@@ -156,6 +157,7 @@ export {
 	BaseGantt,
 	BaseKanbanEmpty,
 	BaseSearch,
+	BaseButton,
 	store,
 	request,
 }