xianniu-ui 0.1.10-beta → 0.1.12-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.1.10-beta",
+  "version": "0.1.12-beta",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {
@@ -25,6 +25,7 @@
     "core-js": "^3.6.5",
     "dayjs": "^1.10.7",
     "good-storage": "^1.1.1",
+    "lodash": "^4.17.21",
     "vue": "^2.6.11",
     "vue-lottie": "^0.2.1",
     "vue-router": "^3.2.0",

package/packages/dialog/main.vue

@@ -1,7 +1,7 @@
 <template>
   <el-dialog
     :title="title"
-    :visible="show"
+    :visible.sync="show"
     :width="width ? width : _width"
     :before-close="beforeClose"
     :top="top"
@@ -10,19 +10,6 @@
     @open="$emit('on-open')"
     @opened="$emit('on-opened')"
   >
-    <!-- <template #title>
-      <div class="flex align-items-center justify-content-between">
-        <div>
-          <span class="el-dialog__title">{{ title }}</span>
-        </div>
-        <div>
-          <slot name="tools" />
-          <div class="el-dialog__headerbtn" @click="onClose">
-            <span class="el-dialog__close el-icon el-icon-close close" />
-          </div>
-        </div>
-      </div>
-    </template> -->
     <slot />
     <span slot="footer">
       <slot name="footer">
@@ -46,7 +33,7 @@ export default {
   props: {
     beforeClose: {
       type: Function,
-      default: () => {},
+      default: null,
     },
     top: {
       type: String,
@@ -90,11 +77,17 @@ export default {
 
   methods: {
     onClose() {
-      this.beforeClose();
+      this.beforeClose()
     },
     onConfirm() {
       this.$emit("on-confirm");
     },
+    // handleBeforeClose() {
+    //   if (this.beforeClose && typeof this.beforeClose === "function") {
+    //     return this.beforeClose();
+    //   }
+    //   this.onClose();
+    // },
   },
 };
 </script>

package/packages/import/main.vue

@@ -1,61 +1,63 @@
 <template>
-    <xn-dialog
-      title="批量导入"
-      v-bind="$attrs"
-      v-on="$listeners"
-      :show-confirm="true"
-      :show.sync="show"
-      @on-confirm="handleConfirm"
-      size="small"
-    >
-      <div class="xn-import">
-        <el-link
-          class="mb-20"
-          type="success"
-          icon="el-icon-download"
-          :underline="false"
-          @click="handleDownload"
-          >下载模板</el-link
-        >
-        <el-upload
-          ref="import"
-          action="###"
-          class="xn-import-upload"
-          v-bind="$attrs"
-          drag
-          :file-list="fileList"
-          :http-request="onSubmitUpload"
-          :before-upload="handleUploadBefore"
-          :on-exceed="onExceed"
-          :on-change="onChange"
-          :on-remove="onRemove"
-          :accept="accept"
-          v-on="$listeners"
-        >
-          <template slot="trigger">
-            <div class="xn-import-trigger">
-              <i class="xn-import-trigger__icon el-icon-upload" />
-              <span class="xn-import-trigger__text">
-                <span>将文件拖到此处，或</span>
-                <em>点击上传</em>
-              </span>
-            </div>
-          </template>
-          <div v-if="tip" slot="tip" class="el-upload__tip">{{ tip }}</div>
-        </el-upload>
-        <div slot="desc" class="xn-import-desc mt-10 fz-12">
-          <el-alert title="注：" type="warning">
-            <div>
-              <p>
-                1、非系统模板的文件会导入失败，请务必使用系统模板，点击上方按钮进行下载
-              </p>
-              <p>2、导入期间请勿进行其他操作</p>
-              <p>3、导入为替换操作，请谨慎操作</p>
-            </div>
-          </el-alert>
-        </div>
-      </div>
-    </xn-dialog>
+  <xn-dialog
+    title="批量导入"
+    v-bind="$attrs"
+    v-on="$listeners"
+    :show.sync="show"
+    :before-close="onClose"
+    @on-confirm="handleConfirm"
+    size="small"
+  >
+    <div class="xn-import">
+      <el-link
+        class="mb-20"
+        type="success"
+        icon="el-icon-download"
+        :underline="false"
+        @click="handleDownload"
+        >下载模板</el-link
+      >
+      <el-upload
+        ref="import"
+        action="###"
+        class="xn-import-upload"
+        v-bind="$attrs"
+        drag
+        :limit="limit"
+        :file-list="fileList"
+        :auto-upload="autoUpload"
+        :http-request="onSubmitUpload"
+        :before-upload="handleUploadBefore"
+        :on-exceed="onExceed"
+        :on-change="onChange"
+        :on-remove="onRemove"
+        :accept="accept"
+        v-on="$listeners"
+      >
+        <template slot="trigger">
+          <div class="xn-import-trigger">
+            <i class="xn-import-trigger__icon el-icon-upload" />
+            <span class="xn-import-trigger__text">
+              <span>将文件拖到此处，或</span>
+              <em>点击上传</em>
+            </span>
+          </div>
+        </template>
+        <div v-if="tip" slot="tip" class="el-upload__tip">{{ tip }}</div>
+      </el-upload>
+      <slot name="desc" class="xn-import-desc mt-10 fz-12">
+        <el-alert title="注：" type="warning">
+          <div>
+            <p>
+              1、非系统模板的文件会导入失败，请务必使用系统模板，点击上方按钮进行下载
+            </p>
+            <p>2、导入期间请勿进行其他操作</p>
+            <p>3、导入为替换操作，请谨慎操作</p>
+          </div>
+        </el-alert>
+      </slot>
+    </div>
+  </xn-dialog>
 </template>
 <script>
 export default {
@@ -66,6 +68,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    limit: {
+      type: Number,
+      default: 1,
+    },
+    autoUpload: {
+      type: Boolean,
+      default: false,
+    },
     tip: {
       type: String,
       default: "仅支持上传excel文件",
@@ -84,8 +94,7 @@ export default {
       fileList: [],
     };
   },
-  created() {
-  },
+  created() {},
   methods: {
     onClose() {
       this.$emit("update:show", false);

package/packages/style/package.json

@@ -1,22 +1,22 @@
-{
-  "name": "xn-ui-style",
-  "version": "1.0.0",
-  "description": "",
-  "main": "lib/index.css",
-  "style": "lib/index.css",
-  "files": [
-    "lib",
-    "src"
-  ],
-  "scripts": {
-    "style": "gulp"
-  },
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "gulp": "^4.0.2",
-    "gulp-autoprefixer": "^8.0.0",
-    "gulp-cssmin": "^0.2.0",
-    "gulp-sass": "^5.1.0"
-  }
-}
+{
+  "name": "xn-ui-style",
+  "version": "1.0.0",
+  "description": "",
+  "main": "lib/index.css",
+  "style": "lib/index.css",
+  "files": [
+    "lib",
+    "src"
+  ],
+  "scripts": {
+    "style": "gulp"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "gulp": "^4.0.2",
+    "gulp-autoprefixer": "^8.0.0",
+    "gulp-cssmin": "^0.2.0",
+    "gulp-sass": "^5.1.0"
+  }
+}

package/packages/table/main.vue

@@ -113,101 +113,14 @@
       </el-table-column>
       <el-table-column
         width="50px"
-        label="序号"
+        label="No."
         v-if="index && data.length"
         type="index"
       ></el-table-column>
 
-      <slot name="column">
-        <template v-for="(item, idx) in columns">
-          <el-table-column
-            v-bind="item"
-            v-on="$listeners"
-            :key="idx"
-            v-if="isShowColumn(item)"
-          >
-            <template v-if="item.labelMsg">
-              <template slot="header">
-                <el-tooltip
-                  class="item"
-                  effect="dark"
-                  :content="item.labelMsg"
-                  placement="right"
-                >
-                  <span>{{ item.label }} <i class="el-icon-question"></i></span>
-                </el-tooltip>
-              </template>
-            </template>
-            <template slot-scope="{ row, $index }">
-              <expandDom
-                v-if="item.render"
-                :column="row"
-                :row="row"
-                :render="item.render"
-                :index="$index"
-              ></expandDom>
-              <template v-else>
-                {{ row[item.prop] }}
-              </template>
-              <!-- 更多操作 -->
-              <template v-if="item.more && item.more.options.length">
-                <template v-for="(itemBtn, idxBtn) in item.more.options">
-                  <expand-dom
-                    v-if="itemBtn.render && itemBtn.show && itemBtn.show(row)"
-                    :key="idxBtn"
-                    :column="itemBtn"
-                    :row="row"
-                    :render="itemBtn.render"
-                    :index="idxBtn"
-                  />
-                  <template v-else>
-                    <el-popconfirm
-                      v-if="itemBtn.isPopConfirm"
-                      :title="
-                        itemBtn.options.title ||
-                        `确定${label(itemBtn, row)}吗？`
-                      "
-                      :key="idxBtn"
-                      :confirm-button-text="itemBtn.options.confirmButtonText"
-                      class="ml-10"
-                      @confirm="handleClick(itemBtn.method, row, $index)"
-                    >
-                      <el-button
-                        :type="itemBtn.type || 'text'"
-                        :size="itemBtn.size || 'mini'"
-                        :icon="itemBtn.icon"
-                        :plain="itemBtn.plain"
-                        slot="reference"
-                        >{{ label(itemBtn, row) }}</el-button
-                      >
-                    </el-popconfirm>
-                    <template v-else>
-                      <el-button
-                        v-if="itemBtn.show ? itemBtn.show(row) : true"
-                        :key="idxBtn"
-                        :disabled="
-                          itemBtn.disabled ? itemBtn.disabled(row) : false
-                        "
-                        :type="itemBtn.type || 'text'"
-                        :size="itemBtn.size || 'mini'"
-                        :icon="itemBtn.icon"
-                        :plain="itemBtn.plain"
-                        @click="handleClick(itemBtn.method, row, $index)"
-                        >{{ label(itemBtn, row) }}</el-button
-                      >
-                    </template>
-                  </template>
-                </template>
-              </template>
-            </template>
-          </el-table-column>
-          <!-- <column
-            :key="idx"
-            v-if="item.checked === true"
-            v-bind="item"
-          ></column> -->
-        </template>
-      </slot>
+      <template v-for="(item, idx) in columns">
+        <column :key="idx" v-if="item.checked === true" v-bind="item"></column>
+      </template>
     </el-table>
 
     <template v-if="!$utils.isEmpty(page)">
@@ -223,30 +136,10 @@
 </template>
 
 <script>
+import column from "./column.vue";
 export default {
   name: "XnTable",
-  components: {
-    expandDom: {
-      functional: true,
-      props: {
-        row: Object,
-        render: Function,
-        index: Number,
-        column: {
-          type: Object,
-          default: null,
-        },
-      },
-      render: (h, ctx) => {
-        const params = {
-          row: ctx.props.row,
-          index: ctx.props.index,
-        };
-        if (ctx.props.column) params.column = ctx.props.column;
-        return ctx.props.render(h, params);
-      },
-    },
-  },
+  components: { column },
   props: {
     tools: {
       type: Array,
@@ -288,23 +181,7 @@ export default {
       selectedData: [],
     };
   },
-  computed: {
-    label() {
-      return (itemBtn, row) => {
-        return typeof itemBtn.label === "function"
-          ? itemBtn.label(row)
-          : itemBtn.label;
-      };
-    },
-    isShowColumn() {
-      return (row) => {
-        if (row.show != undefined) {
-          return typeof row.show === "function" ? row.show() : row.show;
-        }
-        return true;
-      };
-    },
-  },
+  computed: {},
   created() {
     this.columns.length &&
       this.columns.forEach((item) => {
@@ -321,8 +198,8 @@ export default {
       const res = this.data.filter((item) => item.id === val.id);
       this.$emit("on-single", res);
     },
-    handleToolsItem(row, idx) {
-      console.log(row, idx);
+    handleToolsItem(row, index) {
+      this.$emit("on-tools", { row, index });
     },
     handleChangeToolshow(item) {
       item.checked = item.checked === true ? false : true;
@@ -342,15 +219,6 @@ export default {
     doLayout() {
       this.$refs.table.doLayout();
     },
-    handleClick(method, row, index) {
-      if (this.$parent) {
-        this.$parent.$emit("handle-buttons", {
-          method,
-          row,
-          index,
-        });
-      }
-    },
   },
 };
 </script>

package/public/index.html

@@ -12,7 +12,7 @@
     <noscript>
       <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
-    <div id="app"></div>
+    <div id="appDoc"></div>
     <!-- built files will be auto injected -->
   </body>
 </html>

package/src/index.js

@@ -13,6 +13,7 @@ import XnImport from '../packages/import/index'
 import XnExport from '../packages/export/index'
 
 import Utils from 'xn-ui/src/utils/index'
+const doc = 'http://lzwr.gitee.io/xn-ui/#/'
 const components = [
     XnDialog,
     XnTable,
@@ -28,7 +29,9 @@ const components = [
     XnExport
 ]
 const version = require('../package.json').version
-
+if (process.env.NODE_ENV && process.env.NODE_ENV === 'development') {
+    console.log(`doc:${doc}`);
+}
 const install = function (Vue) {
     if (install.installed) return
     if (!Vue.prototype.$ELEMENT) throw new Error('缺失 element-ui，请进行安装')
@@ -38,13 +41,14 @@ const install = function (Vue) {
     })
 
     Vue.prototype.$XN = {
-        uploadUrl: 'https://gateway.dev.xianniu.cn/file-server/oss/uploadFile'
+        uploadUrl: ''
     }
     Vue.prototype.$utils = Utils.$utils
     Vue.prototype.$reg = Utils.$reg
     Vue.prototype.$format = Utils.$format
     Vue.prototype.$dayjs = Utils.$dayjs
     Vue.prototype.$storage = Utils.$storage
+    Vue.prototype.$lodash = Utils.$lodash
 
 }
 if (typeof window !== 'undefined' && window.Vue) {
@@ -53,6 +57,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 
 export default {
     version,
+    doc,
     install,
     XnDialog,
     XnTable,

package/src/utils/index.js

@@ -4,7 +4,7 @@ import format from './format'
 import dayjs from './dayjs'
 import storage from './storage'
 import utils from './utils'
-
+import lodash from 'lodash'
 const version = () => {
     return `xianniu-tools@${require('./package.json').version}`
 }
@@ -14,6 +14,7 @@ export default {
     $reg: reg,
     $format: format,
     $dayjs: dayjs,
+    $lodash: lodash,
     $storage: storage,
     $utils: utils
 }