leisure-core 0.4.50 → 0.4.52

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,69 +22,37 @@ 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";
 
 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,
 ];
 
@@ -126,8 +85,6 @@ const install = function (Vue) {
     },
   });
 
-  Vue.directive("el-drag-dialog", LeDrag);
-
   // Vue.directive("rtable", {
   //   bind(el) {
   //     const { componentInstance: $table } = vnode;
@@ -158,11 +115,7 @@ const install = function (Vue) {
   });
 };
 
-//判断是否是直接引入文件
-if (typeof window !== "undefined" && window.Vue) {
-  window["el-drag-dialog"] = LeDrag;
-  install(window.Vue);
-}
+
 
 export default {
   install,
@@ -170,47 +123,25 @@ export default {
   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,
 };

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

@@ -82,56 +82,30 @@
       :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-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";
 export default {
   name: "le-common-page",
   mixins: [leMixins],
+  components: {
+    LeCommonPageSub,
+  },
   props: {
     tableData: {
       type: Array,
@@ -153,7 +127,7 @@ export default {
       type: Object,
       default: () => {},
     },
-    rulePop: {
+    rules: {
       type: Object,
       default: () => {},
     },
@@ -206,7 +180,7 @@ export default {
   },
   data() {
     return {
-      formPop: {},
+      rowItem: {},
       searchData: {
         pageNo: 1,
         total: 1,
@@ -221,7 +195,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;
       }, {});
@@ -244,35 +218,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,116 @@
+<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"
+    >
+      <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-item v-rfooter>
+      <el-button type="primary" @click="saveData">保存</el-button>
+      <el-button @click="close()">关闭</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+export default {
+  name: "le-common-page-sub",
+  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-media-list/src/main.vue

@@ -87,7 +87,7 @@
 </template>
 <script>
 import { systemMaterialList } from "@/api/media";
-import leMixins from "leisure-core/le-libs/mixins/main"; //
+import leMixins from "../../le-libs/mixins/main"; //
 export default {
   name: "le-media-list",
   mixins: [leMixins],

package/le-role/src/main.vue

@@ -75,11 +75,11 @@
 </template>
 <script>
 import { roleDel, roleList, listUserOfRole } from "@/api/role";
-import LeButton from "leisure-core/le-button/index";
-import LeButtonMsg from "leisure-core/le-button-msg/index";
-import LeDialogContainer from "leisure-core/le-dialog-container/index";
-import LeMenu from "leisure-core/le-menu/index";
-import leMixins from "leisure-core/le-libs/mixins/main";
+import LeButton from "../../le-button/index";
+import LeButtonMsg from "../../le-button-msg/index";
+import LeDialogContainer from "../..//le-dialog-container/index";
+import LeMenu from "../../le-menu/index";
+import leMixins from "../../le-libs/mixins/main";
 import LeRoleSub from "./sub.vue";
 export default {
   name: "le-role",

package/le-user/src/main.vue

@@ -185,7 +185,7 @@ import {
   close,
   userChangePwd,
 } from "@/api/user";
-import leMixins from "leisure-core/le-libs/mixins/main"; //
+import leMixins from "../../le-libs/mixins/main"; //
 import guid from "leisure-js/common/util";
 import moment from "moment";
 import LeUserSub from "./sub.vue";

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "leisure-core",
-  "version": "0.4.50",
-  "description": "leisure-core是leisure-ui-core的简称,是京心数据基于vue2.0开发的一套后台系统框架与js库,包含登录,首页框架等",
+  "version": "0.4.52",
+  "description": "leisure-core是京心数据基于vue2.x开发的一套桌面端组件库，封装了大量实用的UI控件模板,非常方便开发者快速搭建前端应用",
   "private": false,
   "author": "北方乐逍遥(zcx7878)",
   "keywords": [
     "leisure",
-    "leisure-core"
+    "leisure-core",
+    "京心数据"
   ],
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -15,7 +16,6 @@
     "axios": "^0.27.2",
     "core-js": "^3.8.3",
     "dayjs": "^1.11.7",
-    "echarts": "^5.4.2",
     "element-ui": "^2.15.14",
     "leisure-js": "^0.2.3",
     "html2canvas": "^1.4.1",
@@ -28,7 +28,5 @@
     "vxe-table": "^3.6.11",
     "xe-utils": "^3.5.7"
   },
-  "devDependencies": {
-   
-  }
+  "devDependencies": {}
 }

package/le-ad/index.js

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

package/le-ad/src/main.vue

@@ -1,137 +0,0 @@
-<template>
-  <div>
-    <el-form :inline="true" :model="searchData">
-      <el-form-item label="终端">
-        <el-select
-          v-model="searchData.dtype"
-          placeholder="请选择终端类型"
-          clearable
-        >
-          <el-option label="PC" value="0" key="0"></el-option>
-          <el-option label="移动" value="1" key="1"></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="searData">查询</el-button>
-        <el-button type="primary" @click="addAd()">新增广告</el-button>
-      </el-form-item>
-    </el-form>
-    <el-table :data="tableData" border row-key="id" stripe style="width: 100%">
-      <el-table-column prop="dtype" label="终端">
-        <template slot-scope="scope">
-          <span v-if="scope.row.dtype == 0">PC端</span>
-          <span v-if="scope.row.dtype == 1">移动端</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="title" label="广告标题"> </el-table-column>
-      <el-table-column prop="title" label="广告图片" width="100" align="center">
-        <template slot-scope="scope">
-          <el-image style="width: 50px; height: 50px" :src="scope.row.imgsrc">
-          </el-image>
-        </template>
-      </el-table-column>
-      <el-table-column prop="linktype" label="导航类型">
-        <template slot-scope="scope">
-          <span v-if="scope.row.linktype == 0">不导航</span>
-          <span v-if="scope.row.linktype == 1">商城页面</span>
-          <span v-if="scope.row.linktype == 2">商品页面</span>
-          <span v-if="scope.row.linktype == 3">自定义链接</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="link_address" label="导航地址"> </el-table-column>
-      <el-table-column prop="note" label="备注"> </el-table-column>
-      <el-table-column fixed="right" label="操作" align="center" row>
-        <template slot-scope="scope">
-          <le-button
-            id="btnEdit"
-            text="编辑"
-            @click="openEditWindow(scope.row)"
-          ></le-button>
-          <le-button-msg @click="del(scope.row)"></le-button-msg>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div style="text-align: center; margin-top: 30px">
-      <el-pagination
-        background
-        layout="prev, pager, next"
-        :total="searchData.total"
-        :page-size="10"
-        @current-change="current_change"
-      ></el-pagination>
-    </div>
-    <le-dialog-container
-      :showDialog="showDialog"
-      @close="closeDialog"
-      title="广告详情"
-    >
-      <le-ad-sub
-        @close="closeDialog"
-        @rowRefresh="list"
-        :rowitem="currentRow"
-      ></le-ad-sub>
-    </le-dialog-container>
-  </div>
-</template>
-<script>
-import { list, del } from "@/api/system-ad";
-import LeAdSub from "./sub.vue";
-export default {
-  name: "le-ad",
-  components: {
-    LeAdSub,
-  },
-  data() {
-    return {
-      searchData: {
-        pageNo: 1,
-        total: 1,
-        dtype: null,
-      },
-      tableData: [],
-      showDialog: false,
-      currentRow: {},
-    };
-  },
-  mounted() {
-    this.list();
-  },
-  methods: {
-    list() {
-      let params = JSON.parse(JSON.stringify(this.searchData));
-      list(params).then((res) => {
-        let data = res.data.data;
-        if (data) this.tableData = data.list;
-      });
-    },
-    del(id) {
-      let param = {};
-      param.id = id;
-      del(id).then((response) => {
-        this.list();
-        this.$message.success(response.data.info);
-      });
-    },
-    searData() {
-      this.searchData.pageNo = 1;
-      this.list();
-    },
-    current_change(currentPage) {
-      this.searchData.pageNo = currentPage;
-      this.list();
-    },
-    addAd() {
-      this.currentRow = null;
-      this.showDialog = true;
-    },
-    openEditWindow(item) {
-      this.currentRow = item;
-      this.showDialog = true;
-    },
-    closeDialog() {
-      this.currentRow = null;
-      this.showDialog = false;
-    },
-  },
-};
-</script>