tianheng-ui 0.1.69 → 0.1.70

package/packages/FormMaking/custom/configs/tabs.vue

@@ -55,77 +55,65 @@
       </el-form-item>
 
       <el-form-item label-width="0">
-        <div v-if="widget.options.remote">
+        <div v-if="widget.options.remote.open">
           <el-select
-          style="width:100%"
-          v-model="widget.options.remote.api"
-          placeholder="请选择"
-          no-data-text="暂无数据，请查阅相关文档说明"
-          clearable
-          filterable
-        >
-          <el-option
-            v-for="item in apiOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
+            style="width:100%;margin-bottom:5px;"
+            v-model="widget.options.remote.api"
+            placeholder="请选择"
+            no-data-text="暂无数据，请查阅相关文档说明"
+            clearable
+            filterable
           >
-          </el-option>
-        </el-select>
-
-          <!-- <el-input size="mini" style="" v-model="widget.options.props.value">
-            <template slot="prepend">
-              <div style="width:30px;">值</div>
-            </template>
+            <el-option
+              v-for="item in apiOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+          <el-input
+            style="margin-bottom:5px;"
+            v-model="widget.options.remote.props.value"
+          >
+            <div slot="prepend">内容</div>
+          </el-input>
+          <el-input v-model="widget.options.remote.props.label">
+            <div slot="prepend">标签</div>
           </el-input>
-          <el-input size="mini" style="" v-model="widget.options.props.label">
-            <template slot="prepend">
-              <div style="width:30px;">标签</div>
-            </template>
-          </el-input> -->
         </div>
         <template v-else>
           <el-radio-group v-model="widget.options.defaultValue">
             <draggable
-              tag="ul"
               :list="widget.options.columns"
               v-bind="{
-                group: { name: 'tabs' },
+                group: { name: 'options' },
                 ghostClass: 'ghost',
-                handle: '.drag-item'
+                handle: '.drag'
               }"
-              handle=".drag-item"
+              handle=".drag"
             >
-              <li v-for="(item, index) in widget.options.columns" :key="index">
-                <el-radio :label="item.value" style="margin-right: 5px;">
-                  <el-input
-                    v-model="item.value"
-                    style="width:90px;"
-                    size="mini"
-                    placeholder="value"
-                  ></el-input>
-                  <el-input
-                    v-model="item.label"
-                    style="width:90px;"
-                    size="mini"
-                    placeholder="label"
-                  ></el-input>
-                </el-radio>
-                <i
-                  class="drag-item"
-                  style="font-size: 16px;margin: 0 5px;cursor: move;"
-                  ><i class="iconfont icon-icon_bars"></i
-                ></i>
+              <div
+                v-for="(item, index) in widget.options.columns"
+                class="draggable-item"
+                :key="index"
+              >
+                <i class="drag"><i class="iconfont icon-icon_bars"></i></i>
+                <el-radio :label="item.value"> <span></span> </el-radio>
+                <div class="content">
+                  <el-input v-model="item.value"></el-input>
+                  <el-input v-model="item.label"></el-input>
+                </div>
                 <el-button
-                  @click="handleOptionsRemove(index)"
-                  circle
-                  plain
+                  class="delete"
                   type="danger"
                   size="mini"
                   icon="el-icon-minus"
-                  style="padding: 4px;margin-left: 5px;"
+                  circle
+                  plain
+                  @click="handleOptionsRemove(index)"
                 ></el-button>
-              </li>
+              </div>
             </draggable>
           </el-radio-group>
 
@@ -168,4 +156,30 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+.draggable-item {
+  margin-bottom: 5px;
+  display: flex;
+  align-items: center;
+  .el-radio {
+    margin-right: 0;
+    padding-left: 10px;
+  }
+
+  .content {
+    flex: 1;
+    display: flex;
+    margin-right: 5px;
+    > div {
+      margin: 0 2px;
+    }
+  }
+  .drag {
+    font-size: 16px;
+    cursor: move;
+  }
+  .delete {
+    padding: 4px;
+  }
+}
+</style>

package/packages/FormMaking/custom/index.js

@@ -20,7 +20,7 @@ const basicComponents = [
   "editor",
   "cascader"
 ];
-const advanceComponents = ["table", "tableH5", "list", "tabs"];
+const advanceComponents = ["table", "list", "tabs"];
 const layoutComponents = ["grid", "alliance", "filler", "divider"];
 const businessComponents = ["blank", "descriptions"];
 

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

@@ -12,13 +12,13 @@
     >
       <draggable
         v-model="column.list"
-        :no-transition-on-drag="true"
         v-bind="{
           group: 'people',
           ghostClass: 'draggable-ghost',
           animation: 200,
           handle: '.drag-widget'
         }"
+        :no-transition-on-drag="true"
         @add="handleWidgetAdd($event, widget, columnIndex)"
       >
         <transition-group name="fade" tag="div" class="draggable-list">
@@ -50,18 +50,15 @@ export default {
   mixins: [itemsComponent, eventMixin],
   data() {
     return {
-      selectWidget: {}
+      selectWidget: this.select
     };
   },
   watch: {
     select(val) {
       this.selectWidget = val;
     },
-    selectWidget: {
-      handler(val) {
-        this.$emit("update:select", val);
-      },
-      deep: true
+    selectWidget(val) {
+      this.$emit("update:select", val);
     }
   },
   methods: {
@@ -74,7 +71,7 @@ export default {
       );
 
       // 防止布局元素的嵌套拖拽
-      if (item.className.indexOf("data-grid") >= 0) {
+      if (item.className.indexOf("grid") >= 0) {
         // 如果是列表中拖拽的元素需要还原到原来位置
         item.tagName === "DIV" &&
           this.widgetArray.splice(oldIndex, 0, newComponent);

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

@@ -2,34 +2,30 @@
   <div class="component-list">
     <draggable
       v-model="widget.options.columns"
-      :no-transition-on-drag="true"
       v-bind="{
         group: 'people',
         ghostClass: 'draggable-ghost',
         animation: 200,
         handle: '.drag-widget'
       }"
+      :no-transition-on-drag="true"
       @add="handleWidgetAdd($event)"
     >
       <transition-group name="fade" tag="div" class="draggable-list">
-        <div
+        <widget-form-item
           v-for="(element, elementIndex) in widget.options.columns.filter(
             item => {
               return item.key;
             }
           )"
           :key="element.key"
-          @click.stop="selectWidget = element"
+          :widget="element"
+          :widgetArray="widget.options.columns"
+          :widgetIndex="elementIndex"
+          :select.sync="selectWidget"
+          :config="config"
         >
-          <widget-form-item
-            :widget="element"
-            :widgetArray="widget.options.columns"
-            :widgetIndex="elementIndex"
-            :select.sync="selectWidget"
-            :config="config"
-          >
-          </widget-form-item>
-        </div>
+        </widget-form-item>
       </transition-group>
     </draggable>
     <div v-if="widget.options.isDelete" class="tools">
@@ -52,35 +48,34 @@ export default {
   mixins: [itemsComponent, eventMixin],
   data() {
     return {
-      selectWidget: {}
+      selectWidget: this.select
     };
   },
   watch: {
     select(val) {
       this.selectWidget = val;
     },
-    selectWidget: {
-      handler(val) {
-        this.$emit("update:select", val);
-      },
-      deep: true
+    selectWidget(val) {
+      this.$emit("update:select", val);
+    },
+    // 子组建变动后重置初始值
+    "widget.options.columns.length"(val) {
+      this.widget.options.defaultValue = [];
     }
   },
   methods: {
     handleWidgetAdd($event) {
-      console.log("handleWidgetAdd =>", $event);
       const newIndex = $event.newIndex;
       const oldIndex = $event.oldIndex;
       const newComponent = JSON.parse(
         JSON.stringify(this.widget.options.columns[newIndex])
       );
-      const item = $event.item;
+
       // 防止布局元素的嵌套拖拽
-      if (item.className.indexOf("no-put") >= 0) {
+      if ($event.item.className.indexOf("no-put") >= 0) {
         // 如果是列表中拖拽的元素需要还原到原来位置
-        item.tagName === "DIV" &&
+        $event.item.tagName === "DIV" &&
           this.widgetArray.splice(oldIndex, 0, newComponent);
-
         this.widget.options.columns.splice(newIndex, 1);
         return false;
       }
@@ -92,6 +87,7 @@ export default {
         newComponent.model = `${newComponent.type}_${key}`;
       }
       this.$set(this.widget.options.columns, newIndex, newComponent);
+      this.widget.options.defaultValue = [];
       this.selectWidget = newComponent;
     }
   }

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

@@ -2,16 +2,15 @@
   <div class="component-list">
     <div
       v-for="(column, columnIndex) in dataModel"
-      class="tableH5-list"
-      :key="`tableH5_${columnIndex}`"
+      class="list-group"
+      :key="`group_${columnIndex}`"
     >
       <div
         v-for="(element, elementIndex) in widget.options.columns"
-        class="tableH5-list-item"
-        :key="`tableH5_${columnIndex}_${element.key}`"
+        class="list-group-item"
+        :key="elementIndex"
       >
         <generate-form-item
-          style="flex:1;"
           :widget="element"
           :model.sync="
             element.type === 'grid' && !element.options.isEntity
@@ -19,11 +18,7 @@
               : column[element.model]
           "
           :models="models"
-          :pModel="
-            pModel
-              ? `${pModel}.${columnIndex}`
-              : `${widget.model}.${columnIndex}`
-          "
+          :pModel="getPModel(columnIndex)"
           :config="config"
           :slotKeys="slotKeys"
           :componentsData="componentsData"
@@ -66,10 +61,13 @@ import GenerateFormItem from "../../GenerateFormItem.vue";
 export default {
   components: { GenerateFormItem },
   mixins: [itemsComponent, eventMixin],
-  props: ["models", "prop", "slotKeys", "componentsData"],
+  props: ["slotKeys", "componentsData"],
   data() {
     return {};
   },
+  mounted() {
+    console.log("mounted pModel =>", this.pModel);
+  },
   methods: {
     handleTableAdd() {
       let dic = {};
@@ -90,6 +88,10 @@ export default {
       };
       initData(this.widget.options.columns, dic);
       this.dataModel.push(dic);
+    },
+    getPModel(val) {
+      if (this.pModel) return `${this.pModel}.${this.widget.model}.${val}`;
+      else return `${this.widget.model}.${val}`;
     }
   }
 };
@@ -99,11 +101,11 @@ export default {
 .component-list {
   background: #fff;
 
-  .tableH5-list {
-    .tableH5-list-item {
+  .list-group {
+    .list-group-item {
       width: 100%;
     }
-    .tableH5-list-item:nth-child(1) {
+    .list-group-item:nth-child(1) {
       display: flex;
       > div:first-child {
         flex: 1;

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

@@ -2,14 +2,14 @@
   <draggable
     class="component-table"
     v-model="widget.options.columns"
-    :no-transition-on-drag="true"
     v-bind="{
       group: 'people',
       ghostClass: 'draggable-ghost',
       animation: 200,
       handle: '.drag-widget'
     }"
-    @add="handleWidgetAdd($event, widget)"
+    :no-transition-on-drag="true"
+    @add="handleWidgetAdd($event)"
   >
     <transition-group name="fade" tag="div" class="draggable-list">
       <widget-form-item
@@ -39,18 +39,19 @@ export default {
   mixins: [itemsComponent, eventMixin],
   data() {
     return {
-      selectWidget: {}
+      selectWidget: this.select
     };
   },
   watch: {
     select(val) {
       this.selectWidget = val;
     },
-    selectWidget: {
-      handler(val) {
-        this.$emit("update:select", val);
-      },
-      deep: true
+    selectWidget(val) {
+      this.$emit("update:select", val);
+    },
+    // 子组建变动后重置初始值
+    "widget.options.columns.length"(val) {
+      this.widget.options.defaultValue = [];
     }
   },
   methods: {
@@ -60,13 +61,12 @@ export default {
       const newComponent = JSON.parse(
         JSON.stringify(this.widget.options.columns[newIndex])
       );
-      const item = $event.item;
+
       // 防止布局元素的嵌套拖拽
-      if (item.className.indexOf("no-put") >= 0) {
+      if ($event.item.className.indexOf("no-put") >= 0) {
         // 如果是列表中拖拽的元素需要还原到原来位置
-        item.tagName === "DIV" &&
+        $event.item.tagName === "DIV" &&
           this.widgetArray.splice(oldIndex, 0, newComponent);
-
         this.widget.options.columns.splice(newIndex, 1);
         return false;
       }
@@ -78,6 +78,7 @@ export default {
         newComponent.model = `${newComponent.type}_${key}`;
       }
       this.$set(this.widget.options.columns, newIndex, newComponent);
+      this.widget.options.defaultValue = [];
       this.selectWidget = newComponent;
     }
   }

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

@@ -27,11 +27,7 @@
           :widget="element"
           :model.sync="dataModel[scope.$index][element.model]"
           :models="models"
-          :pModel="
-            pModel
-              ? `${pModel}.${scope.$index}`
-              : `${widget.model}.${scope.$index}`
-          "
+          :pModel="getPModel(scope.$index)"
           :config="config"
           :slotKeys="slotKeys"
           :componentsData="componentsData"
@@ -110,6 +106,10 @@ export default {
     },
     handleTableDelete(index) {
       this.dataModel.splice(index, 1);
+    },
+    getPModel(val) {
+      if (this.pModel) return `${this.pModel}.${this.widget.model}.${val}`;
+      else return `${this.widget.model}.${val}`;
     }
   }
 };

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

@@ -13,13 +13,13 @@
     >
       <draggable
         v-model="column.list"
-        :no-transition-on-drag="true"
         v-bind="{
           group: 'people',
           ghostClass: 'draggable-ghost',
           animation: 200,
           handle: '.drag-widget'
         }"
+        :no-transition-on-drag="true"
         @add="handleWidgetAdd($event, widget, columnIndex)"
       >
         <transition-group name="fade" tag="div" class="draggable-list">
@@ -49,18 +49,15 @@ export default {
   mixins: [itemsComponent, eventMixin],
   data() {
     return {
-      selectWidget: {}
+      selectWidget: this.select
     };
   },
   watch: {
     select(val) {
       this.selectWidget = val;
     },
-    selectWidget: {
-      handler(val) {
-        this.$emit("update:select", val);
-      },
-      deep: true
+    selectWidget(val) {
+      this.$emit("update:select", val);
     }
   },
   methods: {

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

@@ -20,11 +20,7 @@
             : dataModel[column.value][element.model]
         "
         :models="models"
-        :pModel="
-          pModel
-            ? `${pModel}.${scope.$index}`
-            : `${widget.model}.${column.value}`
-        "
+        :pModel="getPModel(column.value)"
         :config="config"
         :slotKeys="slotKeys"
         :componentsData="componentsData"
@@ -44,10 +40,12 @@ export default {
   components: { GenerateFormItem },
   mixins: [itemsComponent, eventMixin],
   props: ["slotKeys", "componentsData"],
-  data() {
-    return {};
-  },
-  methods: {}
+  methods: {
+    getPModel(val) {
+      if (this.pModel) return `${this.pModel}.${this.widget.model}.${val}`;
+      else return `${this.widget.model}.${val}`;
+    }
+  }
 };
 </script>