leisure-core 0.4.65 → 0.4.67

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,6 +24,7 @@
     >
       <el-table-column
         v-for="column in tableColumns"
+        show-overflow-tooltip
         :key="column.prop"
         :prop="column.prop"
         :label="column.label"
@@ -53,15 +55,29 @@
           </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
+              v-if="disBtn === 'edit'"
               type="primary"
               size="small"
               @click="editItem(scope.row)"
-              >{{ editMode === "edit" ? "编辑" : "详情" }}</el-button
             >
+              编辑
+            </el-button>
+            <el-button
+              v-if="disBtn === 'detail'"
+              type="primary"
+              size="small"
+              @click="detail(scope.row)"
+              >详情
+            </el-button>
             <el-popconfirm
               v-if="isDispDelBtn"
               :title="`该操作不可逆，确定删除？`"
@@ -74,7 +90,7 @@
               </template>
             </el-popconfirm>
             <div class="rowBtnsExt">
-              <slot name="rowBtns"></slot>
+              <slot name="rowBtns" :scope="scope"></slot>
             </div>
           </div>
         </template>
@@ -102,11 +118,13 @@
         :formColumns="formColumns"
         :field-options="fieldOptions"
         :formData="rowItem"
-        :editMode="editMode"
+        :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>
@@ -127,6 +145,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    opWidht: {
+      type: String,
+      default: "130px",
+    },
     totalData: {
       type: Number,
       default: 1,
@@ -135,6 +157,10 @@ export default {
       type: Array,
       default: () => [],
     },
+    isUserInnerSub: {
+      type: Boolean,
+      default: true,
+    },
     formColumns: {
       type: Array,
       default: () => [],
@@ -179,7 +205,7 @@ export default {
       type: Object,
       default: () => {},
     },
-    editMode: {
+    disBtn: {
       type: String,
       default: "edit",
     },
@@ -207,6 +233,7 @@ export default {
         pageSize: 10,
       },
       showDialog: false,
+      isEditMode: true,
     };
   },
   computed: {},
@@ -238,10 +265,30 @@ export default {
       });
     },
     editItem(row) {
-      this.rowItem = row;
+      this.isEditMode = true;
+      if (this.$listeners["handleData"]) {
+        this.$emit("handleData", row, (res) => {
+          this.rowItem = res;
+        });
+      } 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;
     },
@@ -261,10 +308,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,54 +11,56 @@
       :label="item.label"
       :prop="item.prop"
     >
-      <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
-          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>
-      <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
-        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"
+          <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" v-if="editMode === 'edit'"
+      <le-button type="primary" @click="saveData" v-if="isEditMode"
         >保存</le-button
       >
       <le-button type="info" @click="close()">关闭</le-button>
@@ -94,9 +96,9 @@ export default {
       type: Object,
       default: () => {},
     },
-    editMode: {
-      type: String,
-      default: "edit",
+    isEditMode: {
+      type: Boolean,
+      default: true,
     },
   },
   watch: {
@@ -139,4 +141,9 @@ export default {
   },
 };
 </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/package.json

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