tianheng-ui 0.0.59 → 0.0.62

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.0.59",
+  "version": "0.0.62",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,
@@ -25,7 +25,6 @@
     "mini-css-extract-plugin": "^2.6.1",
     "normalize.css": "^8.0.1",
     "nprogress": "^0.2.0",
-    "vant": "^2.12.50",
     "viewerjs": "^1.10.5",
     "vue": "^2.5.11",
     "vue-i18n": "^5.0.3",

package/packages/Button/index.vue

@@ -58,16 +58,16 @@ export default {
       ];
       return className;
     },
-    _elFormItemSize() {
-      return (this.elFormItem || {}).elFormItemSize;
+    _thFormItemSize() {
+      return (this.thFormItem || {}).thFormItemSize;
     },
     buttonSize() {
-      return this.size || this._elFormItemSize || (this.$ELEMENT || {}).size;
+      return this.size || this._thFormItemSize || (this.$ELEMENT || {}).size;
     },
     buttonDisabled() {
       return this.$options.propsData.hasOwnProperty("disabled")
         ? this.disabled
-        : (this.elForm || {}).disabled;
+        : (this.thForm || {}).disabled;
     }
   },
 

package/packages/CodeEditor/index.vue

@@ -40,7 +40,7 @@ import htmlWorkerUrl from "file-loader!ace-builds/src-noconflict/worker-html";
 ace.config.setModuleUrl("ace/mode/html_worker", htmlWorkerUrl);
 
 export default {
-  name: "CodeEditor",
+  name: "ThCodeEditor",
   model: {
     event: "change"
   },

package/packages/FormMaking/GenerateForm.vue

@@ -1,24 +1,24 @@
 <template>
-  <div>
+  <div v-if="formJson.config">
     <el-form
       class="generateForm"
-      :class="{ 'form-hideLabel': data.config.hideLabel }"
+      :class="{ 'form-hideLabel': formJson.config.hideLabel }"
       :style="{ width: formWidth }"
-      :label-suffix="data.config.labelSuffix"
-      :size="data.config.size"
+      :label-suffix="formJson.config.labelSuffix"
+      :size="formJson.config.size"
       :model="models"
-      :label-position="data.config.labelPosition"
-      :label-width="data.config.labelWidth + 'px'"
+      :label-position="formJson.config.labelPosition"
+      :label-width="formJson.config.labelWidth + 'px'"
       ref="generateForm"
     >
       <genetate-form-item
-        v-for="item in data.list"
+        v-for="item in formJson.list"
         :key="item.key"
         :models.sync="models"
         :widget="item"
         :slotKeys="slotKeys"
         :remote="remote"
-        :config="data.config"
+        :config="formJson.config"
         :prop="item.type === 'grid' ? '' : item.model"
         :componentsData="componentsData"
         @input-change="onInputChange"
@@ -31,21 +31,21 @@
     <!-- <van-form
       v-else
       class="generateForm"
-      :class="{ 'form-hideLabel': data.config.hideLabel }"
+      :class="{ 'form-hideLabel': formJson.config.hideLabel }"
       :style="{ width: formWidth }"
       style="margin: 0 auto;"
-      :label-align="data.config.labelPosition"
-      :label-width="data.config.labelWidth + 'px'"
+      :label-align="formJson.config.labelPosition"
+      :label-width="formJson.config.labelWidth + 'px'"
       ref="generateForm"
     >
       <genetate-form-item-h5
-        v-for="item in data.list"
+        v-for="item in formJson.list"
         :key="item.key"
         :models.sync="models"
         :widget="item"
         :slotKeys="slotKeys"
         :remote="remote"
-        :config="data.config"
+        :config="formJson.config"
         :prop="item.type === 'grid' ? '' : item.model"
         :componentsData="componentsData"
         @input-change="onInputChange"
@@ -60,35 +60,80 @@
 
 <script>
 import GenetateFormItem from "./GenerateFormItem";
-import GenetateFormItemH5 from "./GenerateFormItemH5";
-import Vue from "vue";
-import { Form } from "vant";
-Vue.use(Form);
+// import GenetateFormItemH5 from "./GenerateFormItemH5";
+// import Vue from "vue";
+// import { Form } from "vant";
+// Vue.use(Form);
 
 export default {
   name: "th-generate-form",
-  components: { GenetateFormItem, GenetateFormItemH5 },
-  props: ["data", "remote", "value", "insite", "slotKeys", "client"],
+  components: { GenetateFormItem },
+  props: {
+    data: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    remote: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    value: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    slotKeys: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    },
+    client: String
+  },
   data() {
     return {
+      formJson: this.data,
       models: {},
       componentsData: []
     };
   },
   computed: {
     formWidth() {
-      if (this.data.config.width) return this.data.config.width;
+      if (this.formJson.config.width) return this.formJson.config.width;
       if (this.client === "mobile") return "375px";
 
       return "";
     }
   },
+  watch: {
+    data(val) {
+      this.formJson = val;
+    },
+    formJson: {
+      handler(val) {
+        this.$emit("update:data", val);
+      },
+      deep: true
+    },
+    value: {
+      deep: true,
+      handler(val) {
+        this.models = { ...this.models, ...val };
+      }
+    }
+  },
   created() {
-    this.generateModle(this.data.list);
+    this.generateModle(this.formJson.list);
   },
   mounted() {},
   methods: {
     generateModle(genList, modelObj) {
+      if (!genList) return;
       genList.map(item => {
         if (item.type === "grid") {
           item.columns.forEach(item => {
@@ -185,20 +230,9 @@ export default {
     onInputChange(value, field) {
       this.$emit("on-change", field, value, this.models);
     },
-    refresh() {}
-  },
-  watch: {
-    data: {
-      deep: true,
-      handler(val) {
-        // this.generateModle(val.list);
-      }
-    },
-    value: {
-      deep: true,
-      handler(val) {
-        this.models = { ...this.models, ...val };
-      }
+    setJSON(json) {
+      this.formJson = json;
+      this.generateModle(this.formJson.list);
     }
   }
 };

package/packages/FormMaking/WidgetForm.vue

@@ -33,10 +33,8 @@
       >
         <transition-group name="fade" tag="div" class="widget-form-list">
           <widget-form-item
-            v-for="(element, elementIndex) in data.list.filter(item => {
-              return item.key;
-            })"
-            :key="elementIndex"
+            v-for="(element, elementIndex) in widgetList"
+            :key="element.key"
             :widget="element"
             :widgetIndex="elementIndex"
             :widgetArray="data"
@@ -75,6 +73,11 @@ export default {
     }
   },
   computed: {
+    widgetList() {
+      return this.data.list.filter(item => {
+        return item.key;
+      });
+    },
     formWidth() {
       if (this.data.config.width) return this.data.config.width;
       if (this.client === "mobile") return "375px";
@@ -84,7 +87,11 @@ export default {
   },
   mounted() {
     document.body.ondrop = function(event) {
-      let isFirefox = navigator.userAgent.toLowerCase().indexOf("firefox") > -1;
+      let s = navigator.userAgent;
+      let isFirefox =
+        typeof s === "string"
+          ? s.toLowerCase().indexOf("firefox") > -1
+          : s.indexOf("firefox") > -1;
       if (isFirefox) {
         event.preventDefault();
         event.stopPropagation();

package/packages/FormMaking/custom/items/button.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-button
+  <th-button
     :style="{
       width: widget.options.width,
       height: widget.options.height
@@ -14,7 +14,7 @@
     :icon="widget.options.buttonIcon"
   >
     {{ widget.options.defaultValue }}
-  </el-button>
+  </th-button>
 </template>
 
 <script>

package/packages/FormMaking/custom/items/input.vue

@@ -25,9 +25,6 @@
 
 <script>
 import { itemsComponent } from "../mixins/index";
-import Vue from "vue";
-import { Field } from "vant";
-Vue.use(Field);
 export default {
   mixins: [itemsComponent]
 };

package/packages/{upload → Upload}/index.vue

@@ -283,7 +283,7 @@ export default {
         action: this.action,
         multiple: this.multiple,
         'before-upload': this.beforeUpload,
-        'with-credentials': this.withCredentials,
+        // 'with-credentials': this.withCredentials,
         headers: this.headers,
         name: this.name,
         data: this.data,

package/packages/{upload → Upload}/upload-dragger.vue

@@ -1,6 +1,6 @@
 <template>
   <div
-    class="el-upload-dragger"
+    class="th-upload-dragger"
     :class="{
       'is-dragover': dragover
     }"

package/packages/{upload → Upload}/upload-list.vue

@@ -2,16 +2,16 @@
   <transition-group
     tag="ul"
     :class="[
-      'el-upload-list',
-      'el-upload-list--' + listType,
+      'th-upload-list',
+      'th-upload-list--' + listType,
       { 'is-disabled': disabled }
     ]"
-    name="el-list"
+    name="th-list"
   >
     <li
       v-for="file in files"
       :class="[
-        'el-upload-list__item',
+        'th-upload-list__item',
         'is-' + file.status,
         focusing ? 'focusing' : ''
       ]"
@@ -24,7 +24,7 @@
     >
       <slot :file="file">
         <img
-          class="el-upload-list__item-thumbnail"
+          class="th-upload-list__item-thumbnail"
           v-if="
             file.status !== 'uploading' &&
               ['picture-card', 'picture'].indexOf(listType) > -1
@@ -32,10 +32,10 @@
           :src="file.url"
           alt=""
         />
-        <a class="el-upload-list__item-name" @click="handleClick(file)">
+        <a class="th-upload-list__item-name" @click="handleClick(file)">
           <i class="el-icon-document"></i>{{ file.name }}
         </a>
-        <label class="el-upload-list__item-status-label">
+        <label class="th-upload-list__item-status-label">
           <i
             :class="{
               'el-icon-upload-success': true,
@@ -50,9 +50,9 @@
           v-if="!disabled"
           @click="$emit('remove', file)"
         ></i>
-        <i class="el-icon-close-tip" v-if="!disabled">{{
+        <!-- <i class="el-icon-close-tip" v-if="!disabled">{{
           t("el.upload.deleteTip")
-        }}</i>
+        }}</i> -->
         <!--因为close按钮只在li:focus的时候 display, li blur后就不存在了，所以键盘导航时永远无法 focus到 close按钮上-->
         <el-progress
           v-if="file.status === 'uploading'"
@@ -62,11 +62,11 @@
         >
         </el-progress>
         <span
-          class="el-upload-list__item-actions"
+          class="th-upload-list__item-actions"
           v-if="listType === 'picture-card'"
         >
           <span
-            class="el-upload-list__item-preview"
+            class="th-upload-list__item-preview"
             v-if="handlePreview && listType === 'picture-card'"
             @click="handlePreview(file)"
           >
@@ -74,7 +74,7 @@
           </span>
           <span
             v-if="!disabled"
-            class="el-upload-list__item-delete"
+            class="th-upload-list__item-delete"
             @click="$emit('remove', file)"
           >
             <i class="el-icon-delete"></i>
@@ -85,11 +85,9 @@
   </transition-group>
 </template>
 <script>
-import Locale from "element-ui/src/mixins/locale";
 import ElProgress from "element-ui/packages/progress";
 export default {
   name: "ThUploadList",
-  mixins: [Locale],
   data() {
     return {
       focusing: false

package/packages/{upload → Upload}/upload.vue

@@ -1,3 +1,12 @@
+<template>
+  <div @click="handleClick" :class="classMatch" @keydown="handleKeydown" tabindex="0" >
+      <upload-dragger v-if="drag" :disabled="disabled" @file="uploadFiles"><slot></slot></upload-dragger>
+      <slot v-else></slot>
+      <input class="th-upload__input" type="file" ref="input" :name="name" @change="handleChange" :multiple="multiple" :accept="accept"></input>
+    </div>
+</template>
+
+
 <script>
 import ajax from './ajax';
 import UploadDragger from './upload-dragger.vue';
@@ -54,7 +63,15 @@ export default {
       reqs: {}
     };
   },
-
+  computed: {
+    classMatch(){
+      const classGroup = {
+        'th-upload': true
+      }
+      classGroup[`th-upload--${this.listType}`] = true;
+      return classGroup
+    },
+  },
   methods: {
     isImage(str) {
       return str.indexOf('image') !== -1;
@@ -172,40 +189,5 @@ export default {
       }
     }
   },
-
-  render(h) {
-    let {
-      handleClick,
-      drag,
-      name,
-      handleChange,
-      multiple,
-      accept,
-      listType,
-      uploadFiles,
-      disabled,
-      handleKeydown
-    } = this;
-    const data = {
-      class: {
-        'el-upload': true
-      },
-      on: {
-        click: handleClick,
-        keydown: handleKeydown
-      }
-    };
-    data.class[`el-upload--${listType}`] = true;
-    return (
-      <div {...data} tabindex="0" >
-        {
-          drag
-            ? <upload-dragger disabled={disabled} on-file={uploadFiles}>{this.$slots.default}</upload-dragger>
-            : this.$slots.default
-        }
-        <input class="el-upload__input" type="file" ref="input" name={name} on-change={handleChange} multiple={multiple} accept={accept}></input>
-      </div>
-    );
-  }
 };
 </script>

package/packages/Workflow/penal/listeners/utilSelf.js

@@ -17,7 +17,9 @@ export function initListenerForm(listener) {
         console.log(listener.eventDefinitions, key);
         if (key.indexOf("time") !== -1) {
           k = key;
-          self.eventDefinitionType = key.replace("time", "").toLowerCase();
+          let s = key.replace("time", "");
+          self.eventDefinitionType =
+            typeof s === "string" ? s.toLowerCase() : s;
         }
       }
       console.log(k);

package/packages/upload/locale.js

@@ -1,9 +0,0 @@
-import { t } from 'element-ui/src/locale';
-
-export default {
-  methods: {
-    t(...args) {
-      return t.apply(this, args);
-    }
-  }
-};