tianheng-ui 0.0.64 → 0.0.66

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.0.64",
+  "version": "0.0.66",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,
   "main": "./lib/tianheng-ui.js",
   "style": "lib/theme-chalk/index.css",
   "scripts": {
-    "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot",
-    "build": "cross-env NODE_ENV=preview webpack --progress --hide-modules",
-    "build:npm": "cross-env NODE_ENV=production webpack --progress --hide-modules"
+    "dev": "cross-env NODE_ENV=development webpack-dev-server --open --hot --mode=development",
+    "build": "cross-env NODE_ENV=preview webpack --progress --hide-modules --mode=production",
+    "build:npm": "cross-env NODE_ENV=production webpack --progress --hide-modules --mode=production"
   },
   "dependencies": {
     "ace-builds": "^1.4.13",
@@ -53,6 +53,7 @@
     "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
     "@vue/babel-preset-jsx": "^1.4.0",
     "babel-loader": "^8.2.5",
+    "babel-plugin-component": "^1.1.1",
     "babel-plugin-import": "^1.13.5",
     "bpmn-js": "^8.8.3",
     "bpmn-js-properties-panel": "^0.37.2",

package/packages/Button/index.vue

@@ -77,4 +77,4 @@ export default {
     }
   }
 };
-</script>
+</script>

package/packages/Cell/index.vue

@@ -65,4 +65,4 @@ export default {
     }
   }
 };
-</script>
+</script>

package/packages/Col/index.js

@@ -5,4 +5,4 @@ Col.install = function(Vue) {
   Vue.component(Col.name, Col);
 };
 
-export default Col;
+export default Col;

package/packages/Col/index.vue

@@ -38,4 +38,6 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss">
+@import "../../lib/theme-chalk/styles/col.scss"
+</style>

package/packages/FormMaking/Container.vue

@@ -111,7 +111,11 @@
                 ></i>
               </div>
               <slot name="action"> </slot>
-              <el-popover placement="top" trigger="hover" style="margin:0 10px;">
+              <el-popover
+                placement="top"
+                trigger="hover"
+                style="margin:0 10px;"
+              >
                 <el-button
                   type="text"
                   size="medium"
@@ -508,6 +512,14 @@ export default {
       return list;
     }
   },
+  watch: {
+    widgetFormData: {
+      deep: true,
+      handler: function(val) {
+        // console.log(this.$refs.widgetForm);
+      }
+    }
+  },
   mounted() {},
   methods: {
     // 读取excel file
@@ -594,25 +606,36 @@ export default {
 
             const colKey =
               Date.parse(new Date()) + "_" + Math.ceil(Math.random() * 99999);
-            const col1 = colsDom[i];
-            const col2 = colsDom[i + 1];
-            if (!col1.innerText && !col2.innerText) continue;
+            const titleDom = colsDom[i];
+            const valueDom = colsDom[i + 1];
+            if (!titleDom.innerText && !valueDom.innerText) continue;
 
-            if (colsDom[i + 1]) {
-              span = ((col1.colSpan || 1) + (col2.colSpan || 1)) * colSpan;
+            if (valueDom) {
+              span =
+                ((titleDom.colSpan || 1) + (valueDom.colSpan || 1)) * colSpan;
 
               const data = this.getComponentsConfig("input");
-              data.name = col1.innerText;
-              data.options.defaultValue = col2.innerText;
+              let name = titleDom.innerText;
+              if (name.charAt(0) === "*") {
+                name = name.slice(1)
+                data.options.required = true;
+                data.rules = data.rules || []
+                data.rules.push({
+                  required: true,
+                  message: "单行文本必须填写"
+                });
+              }
+              data.name = name;
+              data.options.defaultValue = valueDom.innerText;
               data.key = colKey;
               data.model = "input_" + colKey;
               grid.columns.push({ span: span, list: [data] });
             } else {
-              span = col1.colSpan * colSpan;
+              span = titleDom.colSpan * colSpan;
 
               const data = this.getComponentsConfig("text");
-              data.name = col1.innerText;
-              data.options.defaultValue = col1.innerText;
+              data.name = titleDom.innerText;
+              data.options.defaultValue = titleDom.innerText;
               data.options.hideLabel = true;
               data.key = colKey;
               data.model = "text_" + colKey;
@@ -742,14 +765,6 @@ export default {
     handleDataChange(field, value, data) {
       // console.log(field, value, data);
     }
-  },
-  watch: {
-    widgetFormData: {
-      deep: true,
-      handler: function(val) {
-        // console.log(this.$refs.widgetForm);
-      }
-    }
   }
 };
 </script>

package/packages/FormMaking/custom/config.js

@@ -29,7 +29,8 @@ export const basicComponents = [
       onChange: "",
       onFocus: "",
       onBlur: ""
-    }
+    },
+    rules: []
   },
   {
     name: "多行文本",

package/packages/FormMaking/generate.js

@@ -0,0 +1,5 @@
+import FormGenerate from "./GenerateForm.vue";
+FormGenerate.install = function(Vue) {
+  Vue.component(FormGenerate.name, FormGenerate);
+};
+export default FormGenerate;

package/packages/FormMaking/index.js

@@ -3,19 +3,17 @@ import "./iconfont/iconfont.css";
 import "./styles/cover.scss";
 import "./styles/index.scss";
 
-import MakingForm from "./Container.vue";
-import GenerateForm from "./GenerateForm.vue";
-
-MakingForm.install = function(Vue) {
-  Vue.component(MakingForm.name, MakingForm);
+import FormMaking from "./Container.vue";
+FormMaking.install = function(Vue) {
+  Vue.component(FormMaking.name, FormMaking);
 };
 
-GenerateForm.install = function(Vue) {
-  Vue.component(GenerateForm.name, GenerateForm);
+import FormGenerate from "./GenerateForm.vue";
+FormGenerate.install = function(Vue) {
+  Vue.component(FormGenerate.name, FormGenerate);
 };
 
-const components = [MakingForm, GenerateForm];
-
+const components = [FormMaking, FormGenerate];
 const install = function(Vue) {
   components.forEach(component => {
     Vue.component(component.name, component);
@@ -26,10 +24,10 @@ if (typeof window !== "undefined" && window.Vue) {
   install(window.Vue);
 }
 
-export { install, MakingForm, GenerateForm };
+export { install, FormMaking, FormGenerate };
 
 export default {
   install,
-  MakingForm,
-  GenerateForm
+  FormMaking,
+  FormGenerate
 };

package/packages/FormMaking/making.js

@@ -0,0 +1,9 @@
+import "normalize.css/normalize.css";
+import "./iconfont/iconfont.css";
+import "./styles/cover.scss";
+import "./styles/index.scss";
+import FormMaking from "./Container.vue";
+FormMaking.install = function(Vue) {
+  Vue.component(FormMaking.name, FormMaking);
+};
+export default FormMaking;

package/packages/Row/index.vue

@@ -31,5 +31,3 @@ export default {
   }
 };
 </script>
-
-<style></style>

package/packages/index.js

@@ -36,7 +36,8 @@ import ImagePreview from "./ImagePreview/index.js";
 import Row from "./Row/index.js";
 import Col from "./Col/index.js";
 import Upload from "./Upload/index.js";
-import { MakingForm, GenerateForm } from "./FormMaking/index.js";
+import FormMaking from "./FormMaking/making.js";
+import FormGenerate from "./FormMaking/generate.js";
 // import Workflow from "../packages/Workflow/index.js";
 
 const components = [
@@ -56,8 +57,8 @@ const components = [
   Row,
   Col,
   Upload,
-  MakingForm,
-  GenerateForm
+  FormMaking,
+  FormGenerate
   // Workflow
 ];
 
@@ -76,26 +77,48 @@ if (typeof window !== "undefined" && window.Vue) {
   install(window.Vue);
 }
 
+const version = require("../package.json").version;
 export default {
-  version: "0.0.64",
+  version: version,
   install,
-  ...components
-  // Cell,
-  // Icons,
-  // Table,
-  // TableAction,
-  // TableSearch,
-  // TableTools,
-  // Empty,
-  // Dialog,
-  // Card,
-  // CodeEditor,
-  // Button,
-  // Image,
-  // ImagePreview,
-  // Row,
-  // Col,
-  // Upload,
-  // MakingForm,
-  // GenerateForm
+  Cell,
+  Icons,
+  Table,
+  TableAction,
+  TableSearch,
+  TableTools,
+  Empty,
+  Dialog,
+  Card,
+  CodeEditor,
+  Button,
+  Image,
+  ImagePreview,
+  Row,
+  Col,
+  Upload,
+  FormMaking,
+  FormGenerate
+};
+
+export {
+  install,
+  Cell,
+  Icons,
+  Table,
+  TableAction,
+  TableSearch,
+  TableTools,
+  Empty,
+  Dialog,
+  Card,
+  CodeEditor,
+  Button,
+  Image,
+  ImagePreview,
+  Row,
+  Col,
+  Upload,
+  FormMaking,
+  FormGenerate
 };