tianheng-ui 0.0.47 → 0.0.50

package/packages/formMaking/util/index.js

@@ -1,33 +1,33 @@
-export const loadJs = (url) => {
-  return new Promise((resolve, reject) => {
-    const script = document.createElement('script')
-    script.src = url
-    script.type = 'text/javascript'
-    document.body.appendChild(script)
-    script.onload = () => {
-      resolve()
-    }
-  }) 
-}
-
-export const loadCss = (url) => {
-  return new Promise((resolve, reject) => {
-    const link = document.createElement('link')
-    link.rel = 'stylesheet'
-    link.href = url
-    document.head.appendChild(link)
-    link.onload = () => {
-      resolve()
-    }
-  })
-}
-
-export const generateUUID = () => {
-  var d = new Date().getTime();
-  var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-      var r = (d + Math.random()*16)%16 | 0;
-      d = Math.floor(d/16);
-      return (c=='x' ? r : (r&0x7|0x8)).toString(16);
-  });
-  return uuid;
+export const loadJs = (url) => {
+  return new Promise((resolve, reject) => {
+    const script = document.createElement('script')
+    script.src = url
+    script.type = 'text/javascript'
+    document.body.appendChild(script)
+    script.onload = () => {
+      resolve()
+    }
+  }) 
+}
+
+export const loadCss = (url) => {
+  return new Promise((resolve, reject) => {
+    const link = document.createElement('link')
+    link.rel = 'stylesheet'
+    link.href = url
+    document.head.appendChild(link)
+    link.onload = () => {
+      resolve()
+    }
+  })
+}
+
+export const generateUUID = () => {
+  var d = new Date().getTime();
+  var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+      var r = (d + Math.random()*16)%16 | 0;
+      d = Math.floor(d/16);
+      return (c=='x' ? r : (r&0x7|0x8)).toString(16);
+  });
+  return uuid;
 }

package/packages/formMaking/util/request.js

@@ -1,28 +1,28 @@
-import axios from 'axios'
-
-const request = axios.create({
-  withCredentials: false
-})
-
-request.interceptors.request.use(
-  config => {
-    return config
-  },
-  error => {
-    console.log('error', error)
-    return Promise.reject(new Error(error).message)
-  }
-)
-
-request.interceptors.response.use(
-  response => {
-    console.log('.....', response)
-    return response.data
-  },
-  error => {
-    console.log('error', error)
-    return Promise.reject(new Error(error).message)
-  }
-)
-
-export default request
+import axios from 'axios'
+
+const request = axios.create({
+  withCredentials: false
+})
+
+request.interceptors.request.use(
+  config => {
+    return config
+  },
+  error => {
+    console.log('error', error)
+    return Promise.reject(new Error(error).message)
+  }
+)
+
+request.interceptors.response.use(
+  response => {
+    console.log('.....', response)
+    return response.data
+  },
+  error => {
+    console.log('error', error)
+    return Promise.reject(new Error(error).message)
+  }
+)
+
+export default request

package/packages/table/search.vue

@@ -1,40 +1,54 @@
 <template>
   <div class="th-table-search">
-    <template v-for="(item, index) in options">
-      <div
-        class="th-table-search-item"
+    <div
+      class="th-table-search-item"
+      v-for="(item, index) in options"
+      :key="index"
+    >
+      <span class="th-table-search-item-title">{{ item.options.name }}：</span>
+      <el-input
         v-if="item.type === 'input'"
-        :key="index"
-      >
-        <span class="th-table-search-item-title">{{ item.props.label }}：</span>
-        <el-input
-          v-model="params[item.props.prop]"
-          :style="{ width: item.width + 'px' }"
-          :placeholder="item.placeholder || '请输入'"
-          :size="item.size"
-          clearable
-        ></el-input>
-      </div>
-      <div
-        class="th-table-search-item"
+        v-model="params[item.options.prop]"
+        :style="{ width: item.options.width + 'px' }"
+        :placeholder="item.options.placeholder || '请输入'"
+        :size="item.options.size"
+        :disabled="item.options.disabled"
+        clearable
+      ></el-input>
+      <el-date-picker
         v-if="item.type === 'date'"
-        :key="index"
+        v-model="params[item.options.prop]"
+        :style="{ width: item.options.width + 'px' }"
+        :type="item.options.dateType || 'date'"
+        :format="item.options.format"
+        :value-format="item.options.valueFormat"
+        :size="item.options.size"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
       >
-        <span class="th-table-search-item-title">{{ item.props.label }}：</span>
-        <el-date-picker
-          v-model="params[item.props.prop]"
-          :style="{ width: item.width + 'px' }"
-          :type="item.dateType || 'date'"
-          :format="item.format"
-          :value-format="item.valueFormat"
-          :size="item.size"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
+      </el-date-picker>
+      <el-select
+        v-if="item.type === 'select'"
+        v-model="params[item.options.prop]"
+        :style="{ width: item.options.width + 'px' }"
+        :placeholder="item.options.placeholder || '请选择'"
+        :size="item.options.size"
+        :multiple="item.options.multiple"
+        :multiple-limit="item.options.multipleLimit"
+        :filterable="item.options.filterable"
+        :disabled="item.options.disabled"
+        clearable
+      >
+        <el-option
+          v-for="option in item.options.options"
+          :key="option.value"
+          :label="option.label"
+          :value="option.value"
         >
-        </el-date-picker>
-      </div>
-    </template>
+        </el-option>
+      </el-select>
+    </div>
 
     <el-button type="primary" icon="el-icon-search" plain @click="doSearch"
       >查询</el-button
@@ -94,15 +108,10 @@ export default {
 
 <style lang="less" scoped>
 .th-table-search {
-  display: flex;
-  align-items: center;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
   &-item {
     display: inline-block;
     margin-right: 15px;
   }
-  .th-table-search-item:last-child {
-    margin-right: 20px !important;
-  }
 }
 </style>