leisure-core 0.4.51 → 0.4.53

package/index.js

@@ -1,29 +1,20 @@
-import LeDrag from "leisure-js/drag/drag.js";
 import {
   parseTime,
   formatMoney,
   formatCurrency,
 } from "leisure-js/common/dformat";
 import LeCommonPage from "./le-common-page/index.js";
-import LeArea from "./le-area/index.js";
 import LeLogin from "./le-login/index.js";
 import LeHome from "./le-home/index.js";
 import LeButton from "./le-button/index.js";
 import LeButtonQr from "./le-button-qr/index.js";
 import LeButtonMsg from "./le-button-msg/index.js";
-import LeCompany from "./le-company/index.js";
 import LeDialogContainer from "./le-dialog-container/index.js";
 import LeRole from "./le-role/index.js";
 import LeMenu from "./le-menu/index.js";
 import LeRoleUser from "./le-role-user/index.js";
-import LeDepart from "./le-depart/index.js";
-import LeCouponGive from "./le-coupon-give/index.js";
 import LeUser from "./le-user/index.js";
-import LeUserType from "./le-user-type/index.js";
 import LeMedia from "./le-media/index.js";
-import LeIntegral from "./le-integral/index.js";
-import LeMember from "./le-member/index.js";
-import LeMemberLevel from "./le-member-level/index.js";
 import LeMediaUpload from "./le-media-upload/index.js";
 import LeMediaList from "./le-media-list/index.js";
 import LeRichText from "./le-rich-text/index.js";
@@ -31,70 +22,50 @@ import LeButtonUpload from "./le-button-upload/index.js";
 import LeButtonSelectMedia from "./le-button-select-media/index.js";
 import LeImage from "./le-image/index.js";
 import LeBackUp from "./le-backup/index.js";
-import LeSeting from "./le-seting/index.js";
-import LeRate from "./le-rate/index.js";
-import { LeCoupon, LeCouponSub, LeCouponDetails } from "./le-coupon/index.js";
 import LeUpload from "./le-upload/index.js";
-import LePromotions from "./le-promotions/index.js";
-import LePromotionsActivities from "./le-promotions-activities/index.js";
-import LeCommission from "./le-commission/index.js";
-import LeCommissionCp from "./le-commission-cp/index.js";
 import LeMpurl from "./le-mpurl/index.js";
 import { LeHelp, LeHelpDetail } from "./le-help/index.js";
-import LeDistribution from "./le-distribution/index.js";
-import LeDistributionCategory from "./le-distribution-category/index.js";
 import LeSelectUser from "./le-select-user/index.js";
-import LeAdSpace from "./le-ad-space/index.js";
-import LeAd from "./le-ad/index.js";
-import LeCp from "./le-cp/index.js";
+import LeArea from "./le-area/index.js";
+import LeSelect from "./le-select/index.js";
+import LeSelectSearch from "./le-select-search/index.js";
+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";
 
 const components = [
   LeArea,
   LeButton,
   LeButtonQr,
   LeButtonMsg,
-  LeCompany,
   LeDialogContainer,
   LeLogin,
   LeHome,
   LeMenu,
   LeRole,
   LeRoleUser,
-  LeDepart,
-  LeCouponGive,
   LeUser,
-  LeUserType,
   LeMedia,
   LeMediaUpload,
-  LeIntegral,
-  LeMember,
-  LeMemberLevel,
   LeMediaList,
   LeRichText,
   LeButtonUpload,
   LeButtonSelectMedia,
   LeImage,
   LeBackUp,
-  LeSeting,
-  LeRate,
   LeUpload,
-  LeCoupon,
-  LeCouponSub,
-  LeCouponDetails,
-  LePromotions,
-  LePromotionsActivities,
-  LeCommission,
-  LeCommissionCp,
   LeMpurl,
   LeHelp,
   LeHelpDetail,
-  LeDistribution,
-  LeDistributionCategory,
   LeSelectUser,
-  LeAdSpace,
-  LeAd,
-  LeCp,
   LeCommonPage,
+  LeSelect,
+  LeSelectSearch,
+  LeInput,
+  LeInputNumber,
+  LeForm,
+  LeFormItem,
 ];
 
 const install = function (Vue) {
@@ -126,8 +97,6 @@ const install = function (Vue) {
     },
   });
 
-  Vue.directive("el-drag-dialog", LeDrag);
-
   // Vue.directive("rtable", {
   //   bind(el) {
   //     const { componentInstance: $table } = vnode;
@@ -158,59 +127,37 @@ const install = function (Vue) {
   });
 };
 
-//判断是否是直接引入文件
-if (typeof window !== "undefined" && window.Vue) {
-  window["el-drag-dialog"] = LeDrag;
-  install(window.Vue);
-}
-
 export default {
   install,
   LeArea,
   LeButton,
   LeButtonQr,
   LeButtonMsg,
-  LeCompany,
   LeDialogContainer,
   LeLogin,
   LeHome,
   LeMenu,
   LeRole,
   LeRoleUser,
-  LeDrag,
-  LeDepart,
-  LeCouponGive,
   LeUser,
-  LeUserType,
   LeMedia,
   LeMediaUpload,
-  LeIntegral,
-  LeMember,
-  LeMemberLevel,
   LeMediaList,
   LeRichText,
   LeButtonUpload,
   LeButtonSelectMedia,
   LeImage,
   LeBackUp,
-  LeSeting,
-  LeRate,
   LeUpload,
-  LeCoupon,
-  LeCouponSub,
-  LeCouponDetails,
-  LePromotions,
-  LePromotionsActivities,
-  LeCommission,
-  LeCommissionCp,
   LeMpurl,
   LeHelp,
   LeHelpDetail,
-  LeDistribution,
-  LeDistributionCategory,
   LeSelectUser,
-  LeAdSpace,
-  LeAd,
-  LeCp,
   LeCommonPage,
+  LeSelect,
+  LeSelectSearch,
+  LeInput,
+  LeInputNumber,
+  LeForm,
+  LeFormItem,
 };

package/le-button/src/main.vue

@@ -1,14 +1,15 @@
 <template>
   <el-button
+    v-bind="$attrs"
+    v-on="$listeners"
+    :class="['customClass', $attrs.class]"
+    :style="$attrs.style"
     :id="id"
     :type="type"
     :size="size"
     v-permission="$route.params.btns"
-    @click="click"
-    :disabled="disabled"
-    style="margin-left: 2px; margin-right: 2px"
     v-if="disp"
-    >{{ text }}</el-button
+    ><slot></slot>{{ text }}</el-button
   >
 </template>
 <script>
@@ -33,21 +34,14 @@ export default {
     },
     text: {
       type: String,
-      default: "按钮",
+      default: "",
     },
     disp: {
       type: Boolean,
       default: true,
     },
-    disabled: {
-      type: Boolean,
-      default: false,
-    },
   },
   methods: {
-    click(param) {
-      this.$emit("click", param);
-    },
   },
 };
 </script>

package/le-button-msg/src/main.vue

@@ -1,5 +1,8 @@
 <template>
   <el-popconfirm
+    v-bind="$attrs"
+    v-on="$listeners"
+    :class="['customClass', $attrs.class]"
     :title="title"
     :id="id"
     @confirm="click"
@@ -8,16 +11,17 @@
     v-if="disp"
   >
     <template #reference>
-      <el-button :type="type" :size="size"
-        ><span v-if="!isDispSlot">{{ text }}</span
-        ><slot v-if="isDispSlot"></slot
-      ></el-button>
+      <le-button :type="type" :size="size" :text="text">
+        <slot></slot>
+      </le-button>
     </template>
   </el-popconfirm>
 </template>
 <script>
+import LeButton from "../../le-button/index";
 export default {
   name: "le-button-msg",
+  components: { LeButton },
   props: {
     id: {
       type: String,
@@ -37,7 +41,7 @@ export default {
     },
     text: {
       type: String,
-      default: "删除",
+      default: "",
     },
     title: {
       type: String,

package/le-button-select-media/src/main.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="le-button-select-media">
-    <el-button type="primary" id="btnSelectMedia" @click="onClick"
-      >选择素材</el-button
+    <le-button type="primary" id="btnSelectMedia" @click="onClick"
+      >选择素材</le-button
     >
     <le-dialog-container
       :title="title"
@@ -19,8 +19,10 @@
   </div>
 </template>
 <script>
+import LeButton from "../../le-button/index";
 export default {
   name: "le-button-select-media",
+  components: { LeButton },
   props: {
     width: {
       type: String,

package/le-button-upload/src/main.vue

@@ -1,8 +1,8 @@
 <template>
   <div>
-    <el-button type="primary" id="btnUpload" @click="onClick">{{
+    <le-button type="primary" id="btnUpload" @click="onClick">{{
       title
-    }}</el-button>
+    }}</le-button>
     <le-dialog-container
       :title="title"
       :showDialog="showDialog"
@@ -18,8 +18,12 @@
   </div>
 </template>
 <script>
+import LeButton from "../../le-button/index";
 export default {
   name: "le-button-upload",
+  components: {
+    LeButton,
+  },
   props: {
     width: {
       type: String,

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

@@ -4,9 +4,9 @@
       <slot name="paramSlot"></slot>
       <el-form-item>
         <slot></slot>
-        <el-button type="primary" @click="onClickQuery()">查询</el-button>
-        <el-button type="primary" @click="addItem()" v-if="isDispAddBtn"
-          >新建</el-button
+        <le-button type="primary" @click="onClickQuery()">查询</le-button>
+        <le-button type="primary" @click="addItem()" v-if="isDispAddBtn"
+          >新建</le-button
         >
       </el-form-item>
     </el-form>
@@ -82,67 +82,32 @@
       :title="popFormTitle"
       :width="popFormWidth"
       :showDialog="showDialog"
-      @close="closeDialog"
-      :showFooter="true"
-      @saveData="saveData"
     >
-      <el-form
-        :model="formPop"
-        :rules="rulePop"
-        ref="ruleForm"
-        :label-width="popFormLabelWidth"
-      >
-        <el-form-item
-          v-for="(item, index) in formColumns"
-          :key="index"
-          :label="item.label"
-          :prop="item.prop"
-        >
-          <el-input
-            v-if="!item.type || item.type === 'input'"
-            v-model="formPop[item.prop]"
-          />
-          <el-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
-            >
-          </el-radio-group>
-          <el-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-select>
-        </el-form-item>
-      </el-form>
+      <le-common-page-sub
+        :rulePop="rules"
+        :popFormLabelWidth="popFormLabelWidth"
+        :formColumns="formColumns"
+        :field-options="fieldOptions"
+        :formData="rowItem"
+        @closeDialog="closeDialog"
+        @saveData="saveData"
+        v-if="showDialog"
+      ></le-common-page-sub>
     </le-dialog-container>
   </div>
 </template>
 <script>
 import { Number } from "core-js";
 import leMixins from "../../le-libs/mixins/main";
+import LeCommonPageSub from "./sub.vue";
+import LeButton from "../../le-button/index";
 export default {
   name: "le-common-page",
   mixins: [leMixins],
+  components: {
+    LeCommonPageSub,
+    LeButton,
+  },
   props: {
     tableData: {
       type: Array,
@@ -164,7 +129,7 @@ export default {
       type: Object,
       default: () => {},
     },
-    rulePop: {
+    rules: {
       type: Object,
       default: () => {},
     },
@@ -217,7 +182,7 @@ export default {
   },
   data() {
     return {
-      formPop: {},
+      rowItem: {},
       searchData: {
         pageNo: 1,
         total: 1,
@@ -232,7 +197,7 @@ export default {
   },
   methods: {
     initFormItem() {
-      this.formPop = this.formColumns.reduce((acc, item) => {
+      this.rowItem = this.formColumns.reduce((acc, item) => {
         acc[item.prop] = item.default;
         return acc;
       }, {});
@@ -255,35 +220,22 @@ export default {
       });
     },
     editItem(row) {
-      this.formPop = row;
+      this.rowItem = row;
       this.showDialog = true;
     },
     addItem() {
       this.initFormItem();
       this.showDialog = true;
     },
-    saveData() {
-      let params = JSON.stringify(this.formPop);
-      if (params == "{}") return;
-      this.$refs["ruleForm"].validate((valid) => {
-        if (valid) {
-          this.$emit("saveForm", this.formPop, () => {
-            this.getList();
-            this.closeDialog();
-          });
-        } else {
-          return false;
-        }
+    saveData(params) {
+      this.$emit("saveForm", params, () => {
+        this.getList();
+        this.closeDialog();
       });
     },
     closeDialog() {
-      this.initFormItem();
       this.showDialog = false;
     },
-    getOptions(prop) {
-      let options = this.fieldOptions[`${prop}Options`] || [];
-      return options;
-    },
   },
 };
 </script>

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

@@ -0,0 +1,122 @@
+<template>
+  <el-form
+    :model="formPop"
+    :rules="rulePop"
+    ref="ruleForm"
+    :label-width="popFormLabelWidth"
+  >
+    <el-form-item
+      v-for="(item, index) in formColumns"
+      :key="index"
+      :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
+        >
+      </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"
+        />
+      </le-select>
+    </el-form-item>
+    <el-form-item v-rfooter>
+      <le-button type="primary" @click="saveData">保存</le-button>
+      <le-button type="info" @click="close()">关闭</le-button>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import LeSelect from "../../le-select/index";
+import LeInput from "../../le-input/index";
+import LeButton from "../../le-button/index";
+// import LeForm from "../../le-form/index";
+// import LeFormItem from "../../le-form-item/index";
+export default {
+  name: "le-common-page-sub",
+  components: { LeSelect, LeInput, LeButton },
+  props: {
+    formColumns: {
+      type: Array,
+      default: () => [],
+    },
+    formData: {
+      type: Object,
+      default: () => {},
+    },
+    rulePop: {
+      type: Object,
+      default: () => {},
+    },
+    popFormLabelWidth: {
+      type: String,
+      default: "100px",
+    },
+    fieldOptions: {
+      type: Object,
+      default: () => {},
+    },
+  },
+  watch: {
+    formData: {
+      handler(val) {
+        this.formPop = val;
+      },
+      deep: true,
+      immediate: true,
+    },
+  },
+  data() {
+    return {
+      formPop: {},
+    };
+  },
+  computed: {},
+  mounted() {},
+  methods: {
+    close() {
+      this.$emit("closeDialog");
+    },
+    saveData() {
+      this.$refs["ruleForm"].validate((valid) => {
+        if (valid) {
+          this.$emit("saveData", this.formPop, () => {});
+        } else {
+          return false;
+        }
+      });
+    },
+    getOptions(prop) {
+      let options = this.fieldOptions[`${prop}Options`] || [];
+      return options;
+    },
+  },
+};
+</script>
+<style lang="less" scoped></style>

package/le-form/index.js

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

package/le-form/src/main.vue

@@ -0,0 +1,13 @@
+<template>
+  <le-form v-bind="$attrs" v-on="$listeners" :style="$attrs.style">
+    <slot></slot>
+  </le-form>
+</template>
+<script>
+export default {
+  name: "le-form",
+  inheritAttrs: false,
+  props: {},
+  methods: {},
+};
+</script>

package/le-form-item/index.js

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

package/le-form-item/src/main.vue

@@ -0,0 +1,13 @@
+<template>
+  <le-form-item v-bind="$attrs" v-on="$listeners" :style="$attrs.style">
+    <slot></slot>
+  </le-form-item>
+</template>
+<script>
+export default {
+  name: "le-form-item",
+  inheritAttrs: false,
+  props: {},
+  methods: {},
+};
+</script>

package/le-help/src/main.vue

@@ -12,8 +12,8 @@
       </el-table-column>
       <el-table-column fixed="right" label="操作" align="center" width="180">
         <template slot-scope="scope">
-          <le-button text="编辑" @click="edit(scope.row)"></le-button>
-          <le-button-msg @click="del(scope.row.id)"></le-button-msg>
+          <le-button @click="edit(scope.row)">编辑</le-button>
+          <le-button-msg @click="del(scope.row.id)">删除</le-button-msg>
         </template>
       </el-table-column>
     </el-table>
@@ -47,10 +47,14 @@
 <script>
 import { list, edit, del } from "@/api/SystemHelp";
 import { LeEditor } from "leisure-editor";
+import leButton from "../../le-button/index";
+import LeButtonMsg from "../../le-button-msg/index";
 export default {
   name: "le-help",
   components: {
     LeEditor,
+    leButton,
+    LeButtonMsg,
   },
   data() {
     return {

package/le-input/index.js

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