leisure-core 0.4.64 → 0.4.66

package/index.js

@@ -34,6 +34,7 @@ import LeInput from "./le-input/index.js";
 import LeForm from "./le-form/index";
 import LeFormItem from "./le-form-item/index";
 import LeInputNumber from "./le-input-number/index.js";
+import LeOption from "./le-option/index.js";
 
 const components = [
   LeArea,
@@ -67,6 +68,7 @@ const components = [
   LeInputNumber,
   LeForm,
   LeFormItem,
+  LeOption,
 ];
 
 const install = function (Vue) {
@@ -168,4 +170,5 @@ export default {
   LeInputNumber,
   LeForm,
   LeFormItem,
+  LeOption,
 };

package/le-common-page/src/main.vue

@@ -8,6 +8,7 @@
         <le-button type="primary" @click="addItem()" v-if="isDispAddBtn"
           >新建</le-button
         >
+        <slot name="headerBtns"></slot>
       </el-form-item>
     </el-form>
     <el-table
@@ -23,11 +24,11 @@
     >
       <el-table-column
         v-for="column in tableColumns"
+        show-overflow-tooltip
         :key="column.prop"
         :prop="column.prop"
         :label="column.label"
         :width="column.width"
-        :formatter="column.formatter"
       >
         <template #default="scope">
           <span v-if="column.type && column.type === 'url'">
@@ -39,16 +40,44 @@
             {{ scope.row[column.prop] == 1 ? "是" : "否" }}
           </span>
           <span v-else>
-            {{ scope.row[column.prop] }}
+            <template v-if="column.formatter">
+              {{
+                column.formatter(
+                  scope.rows,
+                  scope.column,
+                  scope.row[column.prop]
+                )
+              }}
+            </template>
+            <template v-else>
+              {{ scope.row[column.prop] }}
+            </template>
           </span>
         </template>
       </el-table-column>
-      <el-table-column fixed="right" label="操作" align="center">
+      <el-table-column
+        fixed="right"
+        label="操作"
+        :width="opWidht"
+        align="center"
+      >
         <template slot-scope="scope">
           <div class="rowBtns">
-            <el-button type="primary" size="small" @click="editItem(scope.row)"
-              >编辑</el-button
+            <el-button
+              v-if="disBtn === 'edit'"
+              type="primary"
+              size="small"
+              @click="editItem(scope.row)"
             >
+              编辑
+            </el-button>
+            <el-button
+              v-if="disBtn === 'detail'"
+              type="primary"
+              size="small"
+              @click="detail(scope.row)"
+              >详情
+            </el-button>
             <el-popconfirm
               v-if="isDispDelBtn"
               :title="`该操作不可逆，确定删除？`"
@@ -61,7 +90,7 @@
               </template>
             </el-popconfirm>
             <div class="rowBtnsExt">
-              <slot name="rowBtns"></slot>
+              <slot name="rowBtns" :scope="scope"></slot>
             </div>
           </div>
         </template>
@@ -89,10 +118,13 @@
         :formColumns="formColumns"
         :field-options="fieldOptions"
         :formData="rowItem"
+        :isEditMode="isEditMode"
         @closeDialog="closeDialog"
         @saveData="saveData"
-        v-if="showDialog"
-      ></le-common-page-sub>
+        v-if="showDialog && isUserInnerSub"
+      >
+      </le-common-page-sub>
+      <slot name="sub" v-if="showDialog && !isUserInnerSub"></slot>
     </le-dialog-container>
   </div>
 </template>
@@ -113,6 +145,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    opWidht: {
+      type: String,
+      default: "100px",
+    },
     totalData: {
       type: Number,
       default: 1,
@@ -121,6 +157,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    isUserInnerSub: {
+      type: Boolean,
+      default: true,
+    },
     formColumns: {
       type: Array,
       default: () => [],
@@ -147,7 +187,7 @@ export default {
     },
     popFormWidth: {
       type: String,
-      default: "80%",
+      default: "60%",
     },
     popFormLabelWidth: {
       type: String,
@@ -165,6 +205,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    disBtn: {
+      type: String,
+      default: "edit",
+    },
   },
   watch: {
     searchParam: {
@@ -189,6 +233,7 @@ export default {
         pageSize: 10,
       },
       showDialog: false,
+      isEditMode: true,
     };
   },
   computed: {},
@@ -220,10 +265,31 @@ export default {
       });
     },
     editItem(row) {
-      this.rowItem = row;
-      this.showDialog = true;
+      this.isEditMode = true;
+      if (this.$listeners["handleData"]) {
+        this.$emit("handleData", row, (res) => {
+          this.rowItem = res;
+          this.showDialog = true;
+        });
+      } else {
+        this.rowItem = row;
+        this.showDialog = true;
+      }
+    },
+    detail(row) {
+      this.isEditMode = false;
+      if (this.$listeners["handleData"]) {
+        this.$emit("handleData", row, (res) => {
+          this.rowItem = res;
+          this.showDialog = true;
+        });
+      } else {
+        this.rowItem = row;
+        this.showDialog = true;
+      }
     },
     addItem() {
+      this.isEditMode = true;
       this.initFormItem();
       this.showDialog = true;
     },
@@ -243,10 +309,11 @@ export default {
 .rowBtns {
   display: flex;
   display: -webkit-flex;
+  flex-direction: row;
   justify-content: center;
 }
 
 .rowBtnsExt {
-  margin-left: 8px;
+  margin-left: 3px;
 }
 </style>

package/le-common-page/src/sub.vue

@@ -11,43 +11,58 @@
       :label="item.label"
       :prop="item.prop"
     >
-      <le-input
-        v-if="!item.type || item.type === 'input'"
-        v-model="formPop[item.prop]"
-      />
-      <le-input-number
-        v-else-if="item.type === 'number'"
-        v-model="formPop[item.prop]"
-        :min="item.min || 0"
-        :max="item.max || 9999999999"
-        label="item.label||''"
-      />
-      <el-radio-group
-        v-else-if="item.type === 'radio'"
-        v-model="formPop[item.prop]"
-      >
-        <el-radio
-          v-for="(option, index) in item.options"
-          :label="option.id"
-          :key="index + '_radio'"
-          >{{ option.label }}</el-radio
+      <div class="comContainerClass">
+        <le-input
+          v-if="!item.type || item.type === 'input'"
+          v-model="formPop[item.prop]"
+          v-bind="item.attr || {}"
+        />
+        <le-input-number
+          v-else-if="item.type === 'number'"
+          v-model="formPop[item.prop]"
+          v-bind="item.attr || {}"
+          :min="item.min || 0"
+          :max="item.max || 9999999999"
+          label="item.label||''"
+        />
+        <el-radio-group
+          v-else-if="item.type === 'radio'"
+          v-model="formPop[item.prop]"
         >
-      </el-radio-group>
-      <le-select
-        v-else-if="item.type === 'select'"
-        v-model="formPop[item.prop]"
-        placeholder="请选择"
-      >
-        <el-option
-          v-for="option in getOptions(item.prop)"
-          :key="option.value"
-          :label="option.label"
-          :value="option.value"
+          <el-radio
+            v-for="(option, index) in item.options"
+            :label="option.id"
+            :key="index + '_radio'"
+            >{{ option.label }}</el-radio
+          >
+        </el-radio-group>
+        <el-date-picker
+          v-else-if="item.type === 'date'"
+          v-model="formPop[item.prop]"
+          v-bind="item.attr || {}"
+          value-format="timestamp"
+          type="date"
+          placeholder="选择日期"
         />
-      </le-select>
+        <le-select
+          v-else-if="item.type === 'select'"
+          v-model="formPop[item.prop]"
+          v-bind="item.attr || {}"
+          placeholder="请选择"
+        >
+          <le-option
+            :options="fieldOptions[item.prop]"
+            :label="item.kv.label"
+            :value="item.kv.key"
+            :keyNum="item.keyNum"
+          />
+        </le-select>
+      </div>
     </el-form-item>
     <el-form-item v-rfooter>
-      <le-button type="primary" @click="saveData">保存</le-button>
+      <le-button type="primary" @click="saveData" v-if="isEditMode"
+        >保存</le-button
+      >
       <le-button type="info" @click="close()">关闭</le-button>
     </el-form-item>
   </el-form>
@@ -56,9 +71,10 @@
 import LeSelect from "../../le-select/index";
 import LeInput from "../../le-input/index";
 import LeButton from "../../le-button/index";
+import LeOption from "../../le-option/index";
 export default {
   name: "le-common-page-sub",
-  components: { LeSelect, LeInput, LeButton },
+  components: { LeSelect, LeInput, LeButton, LeOption },
   props: {
     formColumns: {
       type: Array,
@@ -80,6 +96,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    isEditMode: {
+      type: Boolean,
+      default: true,
+    },
   },
   watch: {
     formData: {
@@ -89,10 +109,18 @@ export default {
       deep: true,
       immediate: true,
     },
+    fieldOptions: {
+      handler(val) {
+        this.options = val;
+      },
+      deep: true,
+      immediate: true,
+    },
   },
   data() {
     return {
       formPop: {},
+      options: {}, //{field1:[{value:1,label:'选项1'},{value:2,label:'选项2'}]}
     };
   },
   computed: {},
@@ -110,11 +138,12 @@ export default {
         }
       });
     },
-    getOptions(prop) {
-      let options = this.fieldOptions[`${prop}Options`] || [];
-      return options;
-    },
   },
 };
 </script>
-<style lang="less" scoped></style>
+<style lang="scss" scoped>
+.comContainerClass {
+  display: flex;
+  display: -webkit-flex;
+}
+</style>

package/le-mpurl/src/main.vue

@@ -15,7 +15,7 @@
     <el-table-column prop="mp_param" label="参数" width="50"> </el-table-column>
     <el-table-column prop="wx_url" label="微信url" width="100">
     </el-table-column>
-    <el-table-column prop="url_jump" label="推广链接" width="200">
+    <el-table-column prop="url_jump" label="推广链接(仅系统使用)" width="200">
     </el-table-column>
     <!-- <el-table-column prop="url_wx" label="小程序url地址"> </el-table-column> -->
     <el-table-column prop="cdate" label="时间" width="150">

package/le-option/index.js

@@ -0,0 +1,7 @@
+import LeOption from "./src/main.vue";
+
+LeOption.install = function (Vue) {
+  Vue.component(LeOption.name, LeOption);
+};
+
+export default LeOption;

package/le-option/src/main.vue

@@ -0,0 +1,49 @@
+<template>
+  <div>
+    <el-option
+      v-for="item in options"
+      :key="handleKv('key', item)"
+      :label="handleKv('label', item)"
+      :value="handleKv('value', item)"
+    ></el-option>
+  </div>
+</template>
+<script>
+export default {
+  name: "le-options",
+  props: {
+    options: {
+      type: Array,
+      default() {
+        return [];
+      },
+    },
+    value: {
+      type: String,
+      default: "",
+    },
+    label: {
+      type: String,
+      default: "",
+    },
+    keyNum: {
+      type: Number,
+      default: 1,
+    },
+  },
+  methods: {
+    handleKv(type, item) {
+      if (this.keyNum == 1) {
+        if (type == "key" || type == "value") {
+          return item[this.value];
+        } else if (type == "label") {
+          return item[this.label];
+        }
+      }
+      if (this.keyNum == 2) {
+        return item[this.value] + "-" + item[this.label];
+      }
+    },
+  },
+};
+</script>

package/le-select/src/main.vue

@@ -4,6 +4,7 @@
     v-on="$listeners"
     :class="['customClass', $attrs.class]"
     :style="$attrs.style"
+    clearable
   >
     <slot></slot>
   </el-select>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leisure-core",
-  "version": "0.4.64",
+  "version": "0.4.66",
   "description": "leisure-core是京心数据基于vue2.x开发的一套后台管理系统桌面端组件库，封装了大量实用的UI控件模板,非常方便开发者快速搭建前端应用",
   "private": false,
   "author": "北方乐逍遥(zcx7878)",